kelin/EZ-Homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Bitwarden authelia middleware and simplify networks

Browse Source 
- Remove authelia middleware from Vaultwarden (Bitwarden) for app compatibility
- Simplify all compose files to use only homelab-network and traefik-network
- Remove unnecessary isolated networks (nextcloud-network, wordpress-network, etc.)
- Remove monitoring-network, formio-network, and media-network
- All services now communicate through the unified homelab-network
- Maintain traefik-network for proxied services only
This commit is contained in:
EZ-Homelab
2026-01-24 15:30:43 -05:00
parent 93ef87091a
commit 7449c14ac6
6 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/alternatives/docker-compose.yml
View File

@@ -171,7 +171,7 @@ services:
container_name: plex container_name: plex
restart: unless-stopped restart: unless-stopped
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -233,6 +233,4 @@ networks:
external: true external: true
traefik-network: traefik-network:
external: true external: true
media-network:
external: true

26
docker-compose/media-management/docker-compose.yml
View File

@@ -27,7 +27,7 @@ services:
container_name: sonarr container_name: sonarr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -66,7 +66,7 @@ services:
container_name: radarr container_name: radarr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -105,7 +105,7 @@ services:
container_name: prowlarr container_name: prowlarr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -142,7 +142,7 @@ services:
container_name: readarr container_name: readarr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -181,7 +181,7 @@ services:
container_name: lidarr container_name: lidarr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -220,7 +220,7 @@ services:
container_name: lazylibrarian container_name: lazylibrarian
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -260,7 +260,7 @@ services:
container_name: mylar3 container_name: mylar3
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -299,7 +299,7 @@ services:
container_name: jellyseerr container_name: jellyseerr
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -335,7 +335,7 @@ services:
container_name: flaresolverr container_name: flaresolverr
restart: unless-stopped restart: unless-stopped
networks: networks:
- media-network - homelab-network
environment: environment:
- LOG_LEVEL=info - LOG_LEVEL=info
- TZ=${TZ} - TZ=${TZ}
@@ -349,7 +349,7 @@ services:
container_name: tdarr-server container_name: tdarr-server
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -394,7 +394,7 @@ services:
container_name: tdarr-node container_name: tdarr-node
restart: unless-stopped restart: unless-stopped
networks: networks:
- media-network - homelab-network
volumes: volumes:
- ./tdarr/configs:/app/configs - ./tdarr/configs:/app/configs
- ./tdarr/logs:/app/logs - ./tdarr/logs:/app/logs
@@ -419,7 +419,7 @@ services:
container_name: unmanic container_name: unmanic
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -474,8 +474,6 @@ x-dockge:
- https://unmanic.${DOMAIN} - https://unmanic.${DOMAIN}
- http://localhost:8888 - http://localhost:8888
networks: networks:
media-network:
external: true
homelab-network: homelab-network:
external: true external: true
traefik-network: traefik-network:

6
docker-compose/media/docker-compose.yml
View File

@@ -33,7 +33,7 @@ services:
container_name: jellyfin container_name: jellyfin
restart: no restart: no
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -91,7 +91,7 @@ services:
container_name: calibre-web container_name: calibre-web
restart: unless-stopped restart: unless-stopped
networks: networks:
- media-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -133,8 +133,6 @@ x-dockge:
- https://calibre.${DOMAIN} - https://calibre.${DOMAIN}
networks: networks:
media-network:
driver: bridge
homelab-network: homelab-network:
external: true external: true
traefik-network: traefik-network:

16
docker-compose/monitoring/docker-compose.yml
View File

@@ -34,7 +34,7 @@ services:
container_name: prometheus container_name: prometheus
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -83,7 +83,7 @@ services:
container_name: grafana container_name: grafana
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -123,7 +123,7 @@ services:
container_name: node-exporter container_name: node-exporter
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
ports: ports:
- "9100:9100" - "9100:9100"
volumes: volumes:
@@ -146,7 +146,7 @@ services:
container_name: cadvisor container_name: cadvisor
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -193,7 +193,7 @@ services:
container_name: uptime-kuma container_name: uptime-kuma
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -234,7 +234,7 @@ services:
container_name: loki container_name: loki
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
- homelab-network - homelab-network
- traefik-network - traefik-network
ports: ports:
@@ -267,7 +267,7 @@ services:
container_name: promtail container_name: promtail
restart: unless-stopped restart: unless-stopped
networks: networks:
- monitoring-network - homelab-network
volumes: volumes:
- ./config/promtail:/etc/promtail - ./config/promtail:/etc/promtail
- /var/log:/var/log:ro - /var/log:/var/log:ro
@@ -290,8 +290,6 @@ volumes:
driver: local driver: local
networks: networks:
monitoring-network:
driver: bridge
homelab-network: homelab-network:
external: true external: true
traefik-network: traefik-network:

15
docker-compose/productivity/docker-compose.yml
View File

@@ -37,7 +37,6 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- nextcloud-network
ports: ports:
- "8089:80" - "8089:80"
volumes: volumes:
@@ -80,7 +79,7 @@ services:
container_name: nextcloud-db container_name: nextcloud-db
restart: no restart: no
networks: networks:
- nextcloud-network - homelab-network
volumes: volumes:
- nextcloud-db-data:/var/lib/mysql - nextcloud-db-data:/var/lib/mysql
environment: environment:
@@ -140,7 +139,6 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- wordpress-network
ports: ports:
- "8088:80" - "8088:80"
volumes: volumes:
@@ -176,7 +174,7 @@ services:
container_name: wordpress-db container_name: wordpress-db
restart: no restart: no
networks: networks:
- wordpress-network - homelab-network
volumes: volumes:
- wordpress-db-data:/var/lib/mysql - wordpress-db-data:/var/lib/mysql
environment: environment:
@@ -206,7 +204,6 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- gitea-network
ports: ports:
- "3010:3000" - "3010:3000"
volumes: volumes:
@@ -247,7 +244,7 @@ services:
container_name: gitea-db container_name: gitea-db
restart: no restart: no
networks: networks:
- gitea-network - homelab-network
volumes: volumes:
- gitea-db-data:/var/lib/postgresql/data - gitea-db-data:/var/lib/postgresql/data
environment: environment:
@@ -305,7 +302,6 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- bookstack-network
ports: ports:
- "6875:80" - "6875:80"
volumes: volumes:
@@ -346,7 +342,7 @@ services:
container_name: bookstack-db container_name: bookstack-db
restart: no restart: no
networks: networks:
- bookstack-network - homelab-network
volumes: volumes:
- bookstack-db-data:/var/lib/mysql - bookstack-db-data:/var/lib/mysql
environment: environment:
@@ -367,7 +363,6 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- mediawiki-network
ports: ports:
- "8084:80" - "8084:80"
volumes: volumes:
@@ -404,7 +399,7 @@ services:
container_name: mediawiki-db container_name: mediawiki-db
restart: no restart: no
networks: networks:
- mediawiki-network - homelab-network
volumes: volumes:
- mediawiki-db-data:/var/lib/mysql - mediawiki-db-data:/var/lib/mysql
environment: environment:

9
docker-compose/utilities/docker-compose.yml
View File

@@ -104,7 +104,7 @@ services:
networks: networks:
- homelab-network - homelab-network
- traefik-network - traefik-network
- formio-network - homelab-network
ports: ports:
- "3001:3001" - "3001:3001"
environment: environment:
@@ -134,7 +134,7 @@ services:
container_name: formio-mongo container_name: formio-mongo
restart: unless-stopped restart: unless-stopped
networks: networks:
- formio-network - homelab-network
labels: labels:
- "homelab.category=utilities" - "homelab.category=utilities"
- "homelab.description=Form.io database" - "homelab.description=Form.io database"
@@ -179,7 +179,8 @@ services:
- "traefik.http.routers.vaultwarden.entrypoints=websecure" - "traefik.http.routers.vaultwarden.entrypoints=websecure"
- "traefik.http.routers.vaultwarden.tls=true" - "traefik.http.routers.vaultwarden.tls=true"
- "traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt" - "traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt"
- "traefik.http.routers.vaultwarden.middlewares=authelia@docker" # SSO disabled for browser extension and mobile app compatibility
# - "traefik.http.routers.vaultwarden.middlewares=authelia@docker"
- "traefik.http.services.vaultwarden.loadbalancer.server.port=80" - "traefik.http.services.vaultwarden.loadbalancer.server.port=80"
# Authelia Redis - Session storage for Authelia # Authelia Redis - Session storage for Authelia
# No web UI - backend service # No web UI - backend service
@@ -204,5 +205,3 @@ networks:
external: true external: true
traefik-network: traefik-network:
external: true external: true
formio-network:
driver: bridge