From 7449c14ac6673f35cad4f8c65e3e8ed6a5d9a1a9 Mon Sep 17 00:00:00 2001 From: EZ-Homelab Date: Sat, 24 Jan 2026 15:30:43 -0500 Subject: [PATCH] Remove Bitwarden authelia middleware and simplify networks - 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 --- .../alternatives/docker-compose.yml | 4 +-- .../media-management/docker-compose.yml | 26 +++++++++---------- docker-compose/media/docker-compose.yml | 6 ++--- docker-compose/monitoring/docker-compose.yml | 16 +++++------- .../productivity/docker-compose.yml | 15 ++++------- docker-compose/utilities/docker-compose.yml | 9 +++---- 6 files changed, 31 insertions(+), 45 deletions(-) diff --git a/docker-compose/alternatives/docker-compose.yml b/docker-compose/alternatives/docker-compose.yml index 3377c8e..b4f0df9 100644 --- a/docker-compose/alternatives/docker-compose.yml +++ b/docker-compose/alternatives/docker-compose.yml @@ -171,7 +171,7 @@ services: container_name: plex restart: unless-stopped networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -233,6 +233,4 @@ networks: external: true traefik-network: external: true - media-network: - external: true diff --git a/docker-compose/media-management/docker-compose.yml b/docker-compose/media-management/docker-compose.yml index 87d2116..5c724d4 100644 --- a/docker-compose/media-management/docker-compose.yml +++ b/docker-compose/media-management/docker-compose.yml @@ -27,7 +27,7 @@ services: container_name: sonarr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -66,7 +66,7 @@ services: container_name: radarr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -105,7 +105,7 @@ services: container_name: prowlarr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -142,7 +142,7 @@ services: container_name: readarr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -181,7 +181,7 @@ services: container_name: lidarr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -220,7 +220,7 @@ services: container_name: lazylibrarian restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -260,7 +260,7 @@ services: container_name: mylar3 restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -299,7 +299,7 @@ services: container_name: jellyseerr restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -335,7 +335,7 @@ services: container_name: flaresolverr restart: unless-stopped networks: - - media-network + - homelab-network environment: - LOG_LEVEL=info - TZ=${TZ} @@ -349,7 +349,7 @@ services: container_name: tdarr-server restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -394,7 +394,7 @@ services: container_name: tdarr-node restart: unless-stopped networks: - - media-network + - homelab-network volumes: - ./tdarr/configs:/app/configs - ./tdarr/logs:/app/logs @@ -419,7 +419,7 @@ services: container_name: unmanic restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -474,8 +474,6 @@ x-dockge: - https://unmanic.${DOMAIN} - http://localhost:8888 networks: - media-network: - external: true homelab-network: external: true traefik-network: diff --git a/docker-compose/media/docker-compose.yml b/docker-compose/media/docker-compose.yml index 7854267..e8f6081 100644 --- a/docker-compose/media/docker-compose.yml +++ b/docker-compose/media/docker-compose.yml @@ -33,7 +33,7 @@ services: container_name: jellyfin restart: no networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -91,7 +91,7 @@ services: container_name: calibre-web restart: unless-stopped networks: - - media-network + - homelab-network - homelab-network - traefik-network ports: @@ -133,8 +133,6 @@ x-dockge: - https://calibre.${DOMAIN} networks: - media-network: - driver: bridge homelab-network: external: true traefik-network: diff --git a/docker-compose/monitoring/docker-compose.yml b/docker-compose/monitoring/docker-compose.yml index 9af3edb..88dd814 100644 --- a/docker-compose/monitoring/docker-compose.yml +++ b/docker-compose/monitoring/docker-compose.yml @@ -34,7 +34,7 @@ services: container_name: prometheus restart: unless-stopped networks: - - monitoring-network + - homelab-network - homelab-network - traefik-network ports: @@ -83,7 +83,7 @@ services: container_name: grafana restart: unless-stopped networks: - - monitoring-network + - homelab-network - homelab-network - traefik-network ports: @@ -123,7 +123,7 @@ services: container_name: node-exporter restart: unless-stopped networks: - - monitoring-network + - homelab-network ports: - "9100:9100" volumes: @@ -146,7 +146,7 @@ services: container_name: cadvisor restart: unless-stopped networks: - - monitoring-network + - homelab-network - homelab-network - traefik-network ports: @@ -193,7 +193,7 @@ services: container_name: uptime-kuma restart: unless-stopped networks: - - monitoring-network + - homelab-network - homelab-network - traefik-network ports: @@ -234,7 +234,7 @@ services: container_name: loki restart: unless-stopped networks: - - monitoring-network + - homelab-network - homelab-network - traefik-network ports: @@ -267,7 +267,7 @@ services: container_name: promtail restart: unless-stopped networks: - - monitoring-network + - homelab-network volumes: - ./config/promtail:/etc/promtail - /var/log:/var/log:ro @@ -290,8 +290,6 @@ volumes: driver: local networks: - monitoring-network: - driver: bridge homelab-network: external: true traefik-network: diff --git a/docker-compose/productivity/docker-compose.yml b/docker-compose/productivity/docker-compose.yml index 57c7c81..e6355c3 100644 --- a/docker-compose/productivity/docker-compose.yml +++ b/docker-compose/productivity/docker-compose.yml @@ -37,7 +37,6 @@ services: networks: - homelab-network - traefik-network - - nextcloud-network ports: - "8089:80" volumes: @@ -80,7 +79,7 @@ services: container_name: nextcloud-db restart: no networks: - - nextcloud-network + - homelab-network volumes: - nextcloud-db-data:/var/lib/mysql environment: @@ -140,7 +139,6 @@ services: networks: - homelab-network - traefik-network - - wordpress-network ports: - "8088:80" volumes: @@ -176,7 +174,7 @@ services: container_name: wordpress-db restart: no networks: - - wordpress-network + - homelab-network volumes: - wordpress-db-data:/var/lib/mysql environment: @@ -206,7 +204,6 @@ services: networks: - homelab-network - traefik-network - - gitea-network ports: - "3010:3000" volumes: @@ -247,7 +244,7 @@ services: container_name: gitea-db restart: no networks: - - gitea-network + - homelab-network volumes: - gitea-db-data:/var/lib/postgresql/data environment: @@ -305,7 +302,6 @@ services: networks: - homelab-network - traefik-network - - bookstack-network ports: - "6875:80" volumes: @@ -346,7 +342,7 @@ services: container_name: bookstack-db restart: no networks: - - bookstack-network + - homelab-network volumes: - bookstack-db-data:/var/lib/mysql environment: @@ -367,7 +363,6 @@ services: networks: - homelab-network - traefik-network - - mediawiki-network ports: - "8084:80" volumes: @@ -404,7 +399,7 @@ services: container_name: mediawiki-db restart: no networks: - - mediawiki-network + - homelab-network volumes: - mediawiki-db-data:/var/lib/mysql environment: diff --git a/docker-compose/utilities/docker-compose.yml b/docker-compose/utilities/docker-compose.yml index 87d909c..0449455 100644 --- a/docker-compose/utilities/docker-compose.yml +++ b/docker-compose/utilities/docker-compose.yml @@ -104,7 +104,7 @@ services: networks: - homelab-network - traefik-network - - formio-network + - homelab-network ports: - "3001:3001" environment: @@ -134,7 +134,7 @@ services: container_name: formio-mongo restart: unless-stopped networks: - - formio-network + - homelab-network labels: - "homelab.category=utilities" - "homelab.description=Form.io database" @@ -179,7 +179,8 @@ services: - "traefik.http.routers.vaultwarden.entrypoints=websecure" - "traefik.http.routers.vaultwarden.tls=true" - "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" # Authelia Redis - Session storage for Authelia # No web UI - backend service @@ -204,5 +205,3 @@ networks: external: true traefik-network: external: true - formio-network: - driver: bridge