Reset all networks

2023-01-20 18:55:02 +01:00
parent 1daf970ee9
commit 44b95372a1
22 changed files with 57 additions and 52 deletions
--- a/authentication/docker-compose.yml
+++ b/authentication/docker-compose.yml
@@ -17,7 +17,7 @@ services:
      AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: /run/secrets/smtp_password
      AUTHELIA_NOTIFIER_SMTP_SENDER: ${NASCOMPOSE_AUTHELIA_SMTP_SENDER?}
    networks:
-      - traefik
+      - reverse-proxy
    volumes:
      - config:/config
    configs:
@@ -36,7 +36,7 @@ services:
      traefik.enable: true

 networks:
-  traefik:
+  reverse-proxy:
    external: true

 volumes:
--- a/collectors.docker-compose.yml
+++ b/collectors.docker-compose.yml
@@ -8,8 +8,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
    volumes:
      - mylar_config:/config/
      - data:/data
@@ -25,8 +24,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
    volumes:
      - lazylibrarian_config:/config/
      - data:/data
@@ -41,8 +39,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
      - torrents
      - usenet
    volumes:
@@ -59,8 +56,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
      - torrents
      - usenet
    volumes:
@@ -77,7 +73,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
+      - reverse-proxy
    volumes:
      - bazarr_config:/config/
      - data:/data
@@ -92,8 +88,9 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
+      # TODO: connect directly to sonarr/radarr
+      - media-player
    volumes:
      - ombi_config:/config/
    restart: unless-stopped
@@ -101,9 +98,13 @@ services:
      traefik.enable: true

 networks:
-  traefik:
+  reverse-proxy:
    external: true
-  downloads:
+  torrents:
+    external: true
+  usenet:
+    external: true
+  media-player:
    external: true

 volumes:
--- a/indexer/docker-compose.yml
+++ b/indexer/docker-compose.yml
@@ -7,10 +7,11 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
+      - reverse-proxy
      - default
-      - traefik
      - indexer
      - torrents
+      - usenet
    dns:
      # Work around DNS blocks in various regions
      - 1.1.1.1
@@ -30,10 +31,12 @@ networks:
  indexer:
    name: indexer

-  traefik:
+  reverse-proxy:
    external: true
  torrents:
    external: true
+  usenet:
+    external: true

 volumes:
  prowlarr_config:
--- a/media-player/docker-compose.yml
+++ b/media-player/docker-compose.yml
@@ -7,8 +7,8 @@ services:
      PLEX_UID: ${NASCOMPOSE_UID?}
      PLEX_GID: ${NASCOMPOSE_GID?}
    networks:
-      - default
-      - traefik
+      - reverse-proxy
+      - scrobbler
    volumes:
      - plex_transcode:/transcode/
      - plex_config:/config/
@@ -21,7 +21,9 @@ services:
      traefik.http.services.plex.loadbalancer.server.scheme: https

 networks:
-  traefik:
+  reverse-proxy:
+    external: true
+  scrobbler:
    external: true

 volumes:
--- a/network-monitoring/docker-compose.yml
+++ b/network-monitoring/docker-compose.yml
@@ -7,7 +7,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
+      - reverse-proxy
    volumes:
      - smokeping_data:/data/
      - smokeping_config:/config/
@@ -17,7 +17,7 @@ services:
      traefik.http.routers.smokeping.middlewares: authelia@file

 networks:
-  traefik:
+  reverse-proxy:
    external: true

 volumes:
--- a/portal/docker-compose.yml
+++ b/portal/docker-compose.yml
@@ -7,7 +7,7 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
+      - reverse-proxy
    volumes:
      - heimdall_config:/config/
    restart: unless-stopped
@@ -16,7 +16,7 @@ services:
      traefik.http.routers.heimdall.middlewares: authelia@file

 networks:
-  traefik:
+  reverse-proxy:
    external: true

 volumes:
--- a/reverse-proxy/configs/dynamic/authelia.yml
+++ b/reverse-proxy/configs/dynamic/authelia.yml
--- a/reverse-proxy/configs/dynamic/hsts.yml
+++ b/reverse-proxy/configs/dynamic/hsts.yml
--- a/reverse-proxy/configs/dynamic/portainer.yml
+++ b/reverse-proxy/configs/dynamic/portainer.yml
--- a/reverse-proxy/configs/dynamic/synology.yml
+++ b/reverse-proxy/configs/dynamic/synology.yml
--- a/reverse-proxy/configs/dynamic/tls.yml
+++ b/reverse-proxy/configs/dynamic/tls.yml
--- a/reverse-proxy/configs/dynamic/traefik.yml
+++ b/reverse-proxy/configs/dynamic/traefik.yml
--- a/reverse-proxy/configs/dynamic/transmission-api.yml
+++ b/reverse-proxy/configs/dynamic/transmission-api.yml
--- a/reverse-proxy/configs/traefik.yml
+++ b/reverse-proxy/configs/traefik.yml
--- a/reverse-proxy/docker-compose.local.yml
+++ b/reverse-proxy/docker-compose.local.yml
--- a/reverse-proxy/docker-compose.macvlan.yml
+++ b/reverse-proxy/docker-compose.macvlan.yml
--- a/reverse-proxy/docker-compose.yml
+++ b/reverse-proxy/docker-compose.yml
@@ -1,4 +1,4 @@
-name: Proxy
+name: Reverse proxy

 services:
  traefik:
@@ -6,7 +6,7 @@ services:
    environment:
      NASCOMPOSE_TRAEFIK_DOMAINS: ${NASCOMPOSE_TRAEFIK_DOMAINS?}
    networks:
-      - traefik
+      - reverse-proxy
      - docker
    configs:
      - source: traefik_static
@@ -32,27 +32,28 @@ services:
      traefik.http.routers.traefik.service: api@internal

 networks:
+  reverse-proxy:
+    name: traefik
+
  docker:
    external: true
-  traefik:
-    name: traefik

 configs:
  traefik_static:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/traefik.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/traefik.yml
  traefik_dynamic:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/dynamic/traefik.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/dynamic/traefik.yml
  traefik_tls:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/dynamic/tls.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/dynamic/tls.yml
  traefik_hsts:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/dynamic/hsts.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/dynamic/hsts.yml
  traefik_authelia:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/dynamic/authelia.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/dynamic/authelia.yml
  traefik_transmission-api:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/configs/dynamic/transmission-api.yml
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/configs/dynamic/transmission-api.yml

 secrets:
  traefik_tls_cert:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/secrets/traefik.cert
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/secrets/traefik.cert
  traefik_tls_key:
-    file: ${NASCOMPOSE_SERVICES?}/proxy/secrets/traefik.key
+    file: ${NASCOMPOSE_SERVICES?}/reverse-proxy/secrets/traefik.key
--- a/reverse-proxy/secrets/.gitkeep
+++ b/reverse-proxy/secrets/.gitkeep
--- a/scrobbler/docker-compose.yml
+++ b/scrobbler/docker-compose.yml
@@ -9,8 +9,8 @@ services:
      TRAKT_ID_FILE: /run/secrets/trakt_id
      TRAKT_SECRET_FILE: /run/secrets/trakt_secret
    networks:
-      - traefik
-      - media-player
+      - reverse-proxy
+      - scrobbler
    volumes:
      - plaxt_keystore:/app/keystore/
    secrets:
@@ -22,9 +22,10 @@ services:
      traefik.http.routers.plaxt.middlewares: authelia@file

 networks:
-  traefik:
-    external: true
-  media-player:
+  scrobbler:
+    name: scrobbler
+
+  reverse-proxy:
    external: true

 volumes:
--- a/torrents/docker-compose.yml
+++ b/torrents/docker-compose.yml
@@ -13,8 +13,8 @@ services:
    cap_add:
      - NET_ADMIN
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
+      - torrents
    dns:
      # Work around DNS blocks in various regions
      - 1.1.1.1
@@ -35,7 +35,7 @@ networks:
  torrents:
    name: torrents

-  traefik:
+  reverse-proxy:
    external: true

 volumes:
--- a/usenet/docker-compose.yml
+++ b/usenet/docker-compose.yml
@@ -14,8 +14,8 @@ services:
      PUID: ${NASCOMPOSE_UID?}
      PGID: ${NASCOMPOSE_GID?}
    networks:
-      - traefik
-      - downloads
+      - reverse-proxy
+      - usenet
    volumes:
      - sabnzbd_config:/config
      - usenet:/downloads
@@ -27,7 +27,7 @@ networks:
  usenet:
    name: usenet

-  traefik:
+  reverse-proxy:
    external: true

 volumes:
--- a/youtube-dl/docker-compose.yml
+++ b/youtube-dl/docker-compose.yml
@@ -17,7 +17,7 @@ services:
          ]
        }
    networks:
-      - traefik
+      - reverse-proxy
    volumes:
      - youtub-dl:/downloads
    restart: unless-stopped
@@ -26,10 +26,7 @@ services:
      traefik.http.routers.youtube-dl.middlewares: authelia@file

 networks:
-  youtube-dl:
-    name: youtube-dl
-
-  traefik:
+  reverse-proxy:
    external: true

 volumes: