diff --git a/traefik/docker-compose.yml.blanked b/traefik/docker-compose.yml.blanked index 246ddf7..7228ee5 100644 --- a/traefik/docker-compose.yml.blanked +++ b/traefik/docker-compose.yml.blanked @@ -1,7 +1,5 @@ -version: "3" - networks: - traefik-network: + traefik: driver: bridge name: traefik diff --git a/traefik/step1-docker-compose.yml b/traefik/step1-docker-compose.yml deleted file mode 100644 index a59b5b0..0000000 --- a/traefik/step1-docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3' - -services: - step1-traefik: - image: traefik:v2.9 - container_name: step1-traefik - command: --api.insecure=true --providers.docker - ports: - - "80:80" - - "8080:8080" - volumes: - - /var/run/docker.sock:/var/run/docker.sock diff --git a/traefik/step2-docker-compose.yml b/traefik/step2-docker-compose.yml deleted file mode 100644 index 302c295..0000000 --- a/traefik/step2-docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3' - -services: - step2-traefik: - image: traefik:v2.9 - container_name: step2-traefik - command: --api.insecure=true --providers.docker - ports: - - "80:80" - - "8080:8080" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - step2-whoami: - image: traefik/whoami - container_name: step2-whoami - labels: - - "traefik.http.routers.whoami.rule=Host(`whoami.docker.localhost`)" diff --git a/traefik/step3-docker-compose.yml b/traefik/step3-docker-compose.yml deleted file mode 100644 index 7a24259..0000000 --- a/traefik/step3-docker-compose.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "3.3" - -services: - - traefik: - image: "traefik:v2.9" - container_name: "step3-traefik" - command: - - "--api.insecure=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - ports: - - "80:80" - - "8080:8080" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - whoami: - image: "traefik/whoami" - container_name: "step3-whoami" - labels: - - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`whoami.whitney.rip`)" - - "traefik.http.routers.whoami.entrypoints=web" diff --git a/traefik/step4-docker-compose.yml b/traefik/step4-docker-compose.yml deleted file mode 100644 index 6e56e4c..0000000 --- a/traefik/step4-docker-compose.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: "3.3" - -networks: - traefik-network: - -services: - - traefik: - image: "traefik:v2.9" - container_name: "traefik_whitney" - restart: always - networks: - - traefik-network - command: - #- "--log.level=DEBUG" - - "--api.insecure=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - ports: - - "80:80" - - "8080:8080" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - whoami: - image: "traefik/whoami" - container_name: "whoami_whitney" - networks: - - traefik-network - labels: - - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`whoami.whitney.rip`)" - - "traefik.http.routers.whoami.entrypoints=web" - depends_on: - - traefik - diff --git a/traefik/step5-docker-compose.yml b/traefik/step5-docker-compose.yml deleted file mode 100644 index 6e1900d..0000000 --- a/traefik/step5-docker-compose.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3.3" - -networks: - traefik-network: - -services: - - traefik: - image: "traefik:v2.9" - container_name: "traefik_whitney" - restart: always - networks: - - traefik-network - ports: - - "80:80" - - "8080:8080" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "./step5-traefik.toml:/etc/traefik/traefik.toml" - - "./step5-traefik-dynamic.toml:/etc/traefik/dynamic/traefik-dynamic.toml" - - whoami: - image: "traefik/whoami" - container_name: "whoami_whitney" - networks: - - traefik-network - labels: - - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`whoami.whitney.rip`)" - - "traefik.http.routers.whoami.entrypoints=web" - depends_on: - - traefik - diff --git a/traefik/step5-traefik-dynamic.toml b/traefik/step5-traefik-dynamic.toml deleted file mode 100644 index ef3038b..0000000 --- a/traefik/step5-traefik-dynamic.toml +++ /dev/null @@ -1 +0,0 @@ -# Whitney Traefik Dynamic Config diff --git a/traefik/step5-traefik.toml b/traefik/step5-traefik.toml deleted file mode 100644 index ca5486b..0000000 --- a/traefik/step5-traefik.toml +++ /dev/null @@ -1,27 +0,0 @@ -# Whitney Traefik Static Config -[global] - checkNewVersion = true - sendAnonymousUsage = false - -[entryPoints] - [entryPoints.web] - address = ":80" - [entryPoinst.websecure] - address = ":443" - -[providers] - [providers.docker] - watch = true - network = "traefik_traefik-network" - [providers.file] - directory = "/etc/traefik/dynamic/" - watch = true - filename = "traefik-dynamic.toml" - -[api] - insecure = true - dashboard = true - -[log] - level = "error" - diff --git a/traefik/traefik-dynamic.toml.blanked b/traefik/traefik-dynamic.toml.blanked index 8ed425d..725bb52 100644 --- a/traefik/traefik-dynamic.toml.blanked +++ b/traefik/traefik-dynamic.toml.blanked @@ -4,7 +4,7 @@ replacement = "http://www.whitney.com$${1}" permanent = true [http.middlewares.simpleAuth.basicAuth] - users = ["olomana:$2y$05$k9MjyAQnhsdUiWY9laCzD.1Ckidw5IcM282RUgmUyOgHHo.YbtGmq"] + users = ["olomana:password_hash"] [http.routers.api] rule = "Host(`monitor.whitney.rip`)"