diff options
| -rwxr-xr-x | .vscode/settings.json | 21 | ||||
| -rw-r--r-- | config/traefik.yml | 9 | ||||
| -rw-r--r-- | docker-stack.yml | 27 |
3 files changed, 47 insertions, 10 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 71f0ab4..01955ee 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,4 +11,25 @@ "[dockerfile]": { "editor.defaultFormatter": "ms-azuretools.vscode-docker" }, + "redhat.telemetry.enabled": false, + "yaml.schemas": { + "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": [ + "compose.yml", + "compose.yaml", + "compose.*.yml", + "compose.*.yaml", + "*docker*compose.yml", + "*docker*compose.yaml", + "*docker*compose.*.yml", + "*docker*compose.*.yaml", + "stack.yml", + "stack.yaml", + "stack.*.yml", + "stack.*.yaml", + "*docker*stack*.yml", + "*docker*stack*.yaml", + "*docker*stack.*.yml", + "*docker*stack.*.yaml", + ], + }, }
\ No newline at end of file diff --git a/config/traefik.yml b/config/traefik.yml index f51492f..754c2d3 100644 --- a/config/traefik.yml +++ b/config/traefik.yml @@ -10,6 +10,11 @@ http: entryPoints: - websecure rule: "Host(`pihole.tobyvin.com`)" + octoprint: + service: octoprint + entryPoints: + - websecure + rule: "Host(`octoprint.tobyvin.com`)" portainer: service: portainer entryPoints: @@ -30,6 +35,10 @@ http: loadBalancer: servers: - url: "http://pi.hole" + octoprint: + loadBalancer: + servers: + - url: "http://octoprint:80" portainer: loadBalancer: servers: diff --git a/docker-stack.yml b/docker-stack.yml index 8002ad2..3c506b8 100644 --- a/docker-stack.yml +++ b/docker-stack.yml @@ -22,9 +22,12 @@ services: - --entrypoints.websecure.http.tls.certResolver=letsencrypt ## certificatesresolvers - --certificatesresolvers.letsencrypt.acme.httpchallenge - - --certificatesresolvers.letsencrypt.acme.email=$EMAIL + - --certificatesresolvers.letsencrypt.acme.email=tobyv13@gmail.com - --certificatesresolvers.letsencrypt.acme.storage=/data/acme.json - --certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web + configs: + - source: traefik + target: /data/traefik.yml volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - data:/data @@ -44,8 +47,9 @@ services: labels: ## traefik WebUI - traefik.enable=true + - traefik.http.routers.api.entrypoints=websecure + - traefik.http.routers.api.rule=Host(`traefik.tobyvin.com`) - traefik.http.routers.api.service=api@internal - - traefik.http.routers.api.rule=Host(`traefik.$DOMAIN`) - traefik.http.services.api.loadbalancer.server.port=8080 auth: @@ -55,12 +59,12 @@ services: command: - --log-level=warn - --log-format=text - - --auth-host=auth.$DOMAIN - - --cookie-domain=$DOMAIN + - --auth-host=auth.tobyvin.com + - --cookie-domain=tobyvin.com - --default-action=auth - --default-provider=google - --url-path=/_oauth - - --whitelist=$EMAIL,$WHITELIST + - --whitelist=tobyv13@gmail.com,dvincent@ourcomputershop.com secrets: - source: traefik_auth target: /auth @@ -74,7 +78,8 @@ services: - node.labels.traefik == true labels: - traefik.enable=true - - traefik.http.routers.auth.rule=Host(`auth.$DOMAIN`) + - traefik.http.routers.auth.entrypoints=websecure + - traefik.http.routers.auth.rule=Host(`auth.tobyvin.com`) - traefik.http.routers.auth.middlewares=auth - traefik.http.services.auth.loadbalancer.server.port=4181 - traefik.http.middlewares.auth.forwardauth.address=http://auth:4181 @@ -92,12 +97,14 @@ services: - node.labels.traefik == true labels: - traefik.enable=true - - traefik.http.routers.whoami.rule=Host(`whoami.$DOMAIN`) + - traefik.http.routers.whoami.entrypoints=websecure + - traefik.http.routers.whoami.rule=Host(`whoami.tobyvin.com`) - traefik.http.routers.whoami.middlewares=auth + - traefik.http.services.whoami.loadbalancer.server.port=80 -# configs: -# traefik: -# external: true +configs: + traefik: + external: true secrets: traefik_auth: |