From 2dc4d67f0d10a181d85147d69d3b75d411e6002d Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Tue, 13 Oct 2020 19:03:55 +0200
Subject: [PATCH] Removed not used

---
 traefik/docker-compose.yaml      | 48 +++++++++++++++++++++++++-
 traefik/docker-compose.yaml.host | 47 -------------------------
 traefik/docker-compose.yaml.net  | 59 --------------------------------
 3 files changed, 47 insertions(+), 107 deletions(-)
 mode change 120000 => 100644 traefik/docker-compose.yaml
 delete mode 100644 traefik/docker-compose.yaml.host
 delete mode 100644 traefik/docker-compose.yaml.net

diff --git a/traefik/docker-compose.yaml b/traefik/docker-compose.yaml
deleted file mode 120000
index 40d5868..0000000
--- a/traefik/docker-compose.yaml
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose.yaml.host
\ No newline at end of file
diff --git a/traefik/docker-compose.yaml b/traefik/docker-compose.yaml
new file mode 100644
index 0000000..bbb1a4e
--- /dev/null
+++ b/traefik/docker-compose.yaml
@@ -0,0 +1,47 @@
+version: '3'
+
+services:
+  traefik:
+    container_name: traefik
+    image: traefik:latest
+#    command:
+#      - --api
+#      - --api.dashboard
+#      - --entrypoints.http.address=:80
+#      - --entrypoints.https.address=:443
+#      - --providers.docker=true
+#      - --providers.file.watch=true
+#      - --log.level=DEBUG
+    #restart: unless-stopped
+    restart: always
+    #ports:
+    #  - 80:80
+    #  - 443:443
+    environment:
+      - TZ=${DOCKER_TZ}
+    volumes:
+      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
+      - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
+      - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
+      - ${DOCKER_CFG_DIR}/traefik/config:/config
+      #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log
+      - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem
+      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
+      - /var/run/docker.sock:/var/run/docker.sock
+    network_mode: host
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.traefik.entrypoints=http"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.middlewares=traefik-auth"
+      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
+      - "traefik.http.routers.traefik-secure.entrypoints=https"
+      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
+      - "traefik.http.routers.traefik-secure.tls=true"
+      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
+      - "traefik.http.routers.traefik-secure.service=api@internal"
+      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+      - "traefik.http.services.workaround.loadbalancer.server.port=9999"
diff --git a/traefik/docker-compose.yaml.host b/traefik/docker-compose.yaml.host
deleted file mode 100644
index bbb1a4e..0000000
--- a/traefik/docker-compose.yaml.host
+++ /dev/null
@@ -1,47 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    container_name: traefik
-    image: traefik:latest
-#    command:
-#      - --api
-#      - --api.dashboard
-#      - --entrypoints.http.address=:80
-#      - --entrypoints.https.address=:443
-#      - --providers.docker=true
-#      - --providers.file.watch=true
-#      - --log.level=DEBUG
-    #restart: unless-stopped
-    restart: always
-    #ports:
-    #  - 80:80
-    #  - 443:443
-    environment:
-      - TZ=${DOCKER_TZ}
-    volumes:
-      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
-      - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
-      - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
-      - ${DOCKER_CFG_DIR}/traefik/config:/config
-      #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log
-      - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem
-      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
-      - /var/run/docker.sock:/var/run/docker.sock
-    network_mode: host
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik.entrypoints=http"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
-      - "traefik.http.routers.traefik-secure.entrypoints=https"
-      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik-secure.tls=true"
-      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
-      - "traefik.http.routers.traefik-secure.service=api@internal"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
-      - "traefik.http.services.workaround.loadbalancer.server.port=9999"
diff --git a/traefik/docker-compose.yaml.net b/traefik/docker-compose.yaml.net
deleted file mode 100644
index e11de7b..0000000
--- a/traefik/docker-compose.yaml.net
+++ /dev/null
@@ -1,59 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    container_name: traefik
-    image: traefik:latest
-#    command:
-#      - --api
-#      - --api.dashboard
-#      - --entrypoints.http.address=:80
-#      - --entrypoints.https.address=:443
-#      - --providers.docker=true
-#      - --providers.file.watch=true
-#      - --log.level=DEBUG
-    #restart: unless-stopped
-    restart: always
-    ports:
-      - 80:80
-      - 443:443
-    environment:
-      - TZ=${DOCKER_TZ}
-    volumes:
-      - ${DOCKER_CFG_DIR}/traefik/traefik.yml:/traefik.yml:ro
-      - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
-      - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
-      - ${DOCKER_CFG_DIR}/traefik/config:/config
-      #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log
-      - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem
-      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      proxy:
-        ipv4_address: 172.18.0.200
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik.entrypoints=http"
-      - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
-      #- "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`) ||
-      #                                    (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
-      - "traefik.http.routers.traefik.service=api@internal"
-      - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      #- "traefik.http.routers.traefik.middlewares=traefik-auth,traefik-stripprefix"
-      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
-      - "traefik.http.routers.traefik-secure.entrypoints=https"
-      - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
-      #- "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`) ||
-      #                                           (Host(`docker.giorgioravera.it`) && (PathPrefix(`/traefik`) || PathPrefix(`/api`)))"
-      - "traefik.http.routers.traefik-secure.tls=true"
-      #- "traefik.http.routers.traefik-secure.tls.certresolver=http"
-      - "traefik.http.routers.traefik-secure.service=api@internal"
-      - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
-      #- "traefik.http.routers.traefik-secure.middlewares=traefik-auth,traefik-stripprefix"
-      #- "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
-      - "traefik.http.middlewares.traefik-stripprefix.stripprefix.prefixes=/traefik"
-
-networks:
-  proxy:
-    external: true
-- 
2.47.3