From 79ce158559dc7b528a93eaea4445db5f7b0ee832 Mon Sep 17 00:00:00 2001 From: msnie Date: Fri, 31 Jan 2025 21:08:24 +0100 Subject: [PATCH] mastodon --- bedrock/docker-compose.yml | 14 +++++++------- traefik/docker-compose.yml | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 0fd7b2d..bdc359a 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -21,13 +21,13 @@ services: volumes: - /etc/timezone:/etc/timezone:ro - /srv/bedrock:/data - labels: - - "traefik.http.routers.bedrock.entrypoints=websecure" - - "traefik.http.routers.bedrock.rule=Host(`bedrock.knast.cc`)" - - "traefik.http.routers.bedrock.tls.certresolver=letsencr" - - "traefik.udp.routers.bedrock.entrypoints=bedrock" - - "traefik.udp.routers.bedrock.service=bedrock" - - "traefik.udp.services.bedrock.loadbalancer.server.port=19132" + # labels: + # - "traefik.http.routers.bedrock.entrypoints=websecure" + # - "traefik.http.routers.bedrock.rule=Host(`bedrock.knast.cc`)" + # - "traefik.http.routers.bedrock.tls.certresolver=letsencr" + # - "traefik.udp.routers.bedrock.entrypoints=bedrock" + # - "traefik.udp.routers.bedrock.service=bedrock" + # - "traefik.udp.services.bedrock.loadbalancer.server.port=19132" networks: traefik: diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index 30e64a5..e7d213e 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -14,16 +14,16 @@ services: ports: - "80:80" - "443:443" - # - "8080:8080" + - "8080:8080" volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - "./traefik.yml:/traefik.yml:ro" - /var/log/traefik/:/opt/traefik/logs - /srv/traefik/letsencrypt:/etc/letsencrypt - # command: + command: # - --api.insecure=false - # - --api.insecure=true + - --api.insecure=true restart: unless-stopped labels: - "traefik.enable=true" @@ -31,8 +31,8 @@ services: # - "traefik.http.routers.traefiks.entrypoints=websecure" # - "traefik.http.routers.traefiks.rule=Host(`monitor.$DOMAIN_NAME`)" # - "traefik.http.routers.traefiks.tls.certresolver=letsencr" - # - "traefik.http.middlewares.auth.basicauth.users=admin:$$2a$12$2fgQL6tIUB7qwKVQPrhUQew3wZ3noWmLt5dmyk.KWDcuZR5vs01wO" - # - "traefik.http.routers.traefiks.middlewares=auth" + - "traefik.http.middlewares.auth.basicauth.users=admin:$$2a$12$2fgQL6tIUB7qwKVQPrhUQew3wZ3noWmLt5dmyk.KWDcuZR5vs01wO" + - "traefik.http.routers.traefiks.middlewares=auth" - traefik.http.middlewares.https_redirect.redirectscheme.scheme=https - traefik.http.middlewares.https_redirect.redirectscheme.permanent=true - traefik.http.routers.http_catchall.rule=HostRegexp(`{any:.+}`)