diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index 891f5bb..538d320 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -57,10 +57,10 @@ services: - homepage.group=Management - homepage.name=Authentik - homepage.icon=sh-authentik-light - - homepage.href=https://auth.dua.casa/ + - homepage.href=https://auth.dua.casa - homepage.description=Open-source Identity Provider - homepage.widget.type=authentik - - homepage.widget.url=http://auth.apps.dua.casa/ + - homepage.widget.url=https://auth.dua.casa - homepage.widget.key=hJL6cDzzaeN6olr2MJoYkVNDTgfihufib1TWEw0GxjjoIgy9LuYVF4FZjsMX - "traefik.enable=true" diff --git a/freshrss/docker-compose.yml b/freshrss/docker-compose.yml index d5939bc..1f580ed 100644 --- a/freshrss/docker-compose.yml +++ b/freshrss/docker-compose.yml @@ -10,6 +10,9 @@ services: - /mnt/docker-storage/freshrss/data:/var/www/FreshRSS/data # Optional volume for storing third-party extensions - /mnt/docker-storage/freshrss/extensions:/var/www/FreshRSS/extensions + networks: + - traefik_proxy + - default ports: # If you want to open a port 8080 on the local machine: - "8095:80" @@ -34,13 +37,21 @@ services: - homepage.group=Storage - homepage.name=FreshRSS - homepage.icon=sh-freshrss-light - - homepage.href=https://rss.dua.casa/ + - homepage.href=https://rss.dua.casa - homepage.description=A free, self-hostable feed aggregator. - homepage.widget.type=freshrss - - homepage.widget.url=http://cluster.localdomain:8095 + - homepage.widget.url=https://rss.dua.casa - homepage.widget.username=hayden0828 - homepage.widget.password=XlRYT2vUV9PHIajtsY566ah7gvoLEOE4 + - "traefik.enable=true" + - "traefik.http.routers.freshrss.rule=Host(`rss.apps.dua.casa`)" + - "traefik.http.routers.freshrss.entrypoints=websecure" + - "traefik.http.routers.freshrss.tls=true" + - "traefik.http.routers.freshrss.tls.certresolver=letsencrypt" + - "traefik.http.services.freshrss.loadbalancer.server.port=8095" + - "traefik.http.services.freshrss.loadbalancer.server.scheme=https" + rsshub: image: diygod/rsshub:chromium-bundled restart: always @@ -68,6 +79,15 @@ services: # JavDB Cookie JAVDB_SESSION: ${JAVDB_SESSION} + deploy: + labels: + - "traefik.enable=true" + - "traefik.http.routers.rsshub.rule=Host(`rss-hub.apps.dua.casa`)" + - "traefik.http.routers.rsshub.entrypoints=websecure" + - "traefik.http.routers.rsshub.tls=true" + - "traefik.http.routers.rsshub.tls.certresolver=letsencrypt" + - "traefik.http.services.rsshub.loadbalancer.server.port=1200" + - "traefik.http.services.rsshub.loadbalancer.server.scheme=https" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:1200/healthz"] interval: 60s @@ -88,3 +108,7 @@ services: timeout: 10s retries: 5 start_period: 5s + +networks: + traefik_proxy: + external: true