From 928184360af1fc755191300b0e14c90234a1e65d Mon Sep 17 00:00:00 2001 From: trjohnson19 <77356759+trjohnson19@users.noreply.github.com> Date: Wed, 6 Aug 2025 13:25:38 -0500 Subject: [PATCH 1/2] Purge `traefik2` / `t2` / ... --- .bash_aliases.example | 24 +++++++++---------- .env.example | 14 +++++------ .../config/ak-outpost-ldap-conf.example.yml | 2 +- backup-scripts/borg-patternfile.example.lst | 2 +- compose/adminer.yml | 2 +- compose/audiobookshelf.yml | 2 +- compose/authelia.yml | 2 +- compose/authentik.yml | 4 ++-- compose/bazarr.yml | 2 +- compose/bluebubbles.yml | 4 ++-- compose/calibre-web.yml | 2 +- compose/calibre.yml | 2 +- compose/dozzle.yml | 2 +- compose/duckdns.yml | 2 +- compose/dupeguru.yml | 2 +- compose/filebrowser.yml | 2 +- compose/firefly.yml | 4 ++-- compose/flaresolverr.yml | 2 +- compose/glances.yml | 2 +- compose/gluetun-private.yml | 2 +- compose/gluetun-temp.yml | 2 +- compose/gotify.yml | 2 +- compose/guacamole.yml | 4 ++-- compose/handbrake.yml | 2 +- compose/heimdall.yml | 2 +- compose/jellyfin.yml | 2 +- compose/keycloak.yml | 2 +- compose/lidarr.yml | 2 +- compose/maintainerr.yml | 2 +- compose/mariadb.yml | 2 +- compose/minecraft-rcon.yml | 2 +- compose/minecraft.yml | 2 +- compose/nextcloud.yml | 4 ++-- compose/ombi.yml | 2 +- compose/organizr.yml | 2 +- compose/overseerr.yml | 2 +- compose/phpmyadmin.yml | 2 +- compose/pi-hole.yml | 2 +- compose/plex.yml | 2 +- compose/portfolio.yml | 2 +- compose/postgres.yml | 2 +- compose/prowlarr.yml | 2 +- compose/radarr-4k.yml | 2 +- compose/radarr.yml | 2 +- compose/redis.yml | 2 +- compose/rediscommander.yml | 2 +- compose/sonarr-4k.yml | 2 +- compose/sonarr.yml | 2 +- compose/tautulli.yml | 2 +- compose/tdarr-node.yml | 2 +- compose/tdarr.yml | 2 +- compose/traefik.yml | 4 ++-- compose/vaultwarden.yml | 2 +- compose/vscode.yml | 2 +- compose/watchtower.yml | 2 +- compose/whoami.yml | 2 +- compose/wireguard.yml | 2 +- docker-compose.yml | 10 ++++---- 58 files changed, 85 insertions(+), 85 deletions(-) diff --git a/.bash_aliases.example b/.bash_aliases.example index d9a8f7d..c8fbf62 100644 --- a/.bash_aliases.example +++ b/.bash_aliases.example @@ -14,15 +14,15 @@ alias docdf='sudo docker system df' alias dclogs='sudo docker logs -tf --tail="50" ' alias fixsecrets='sudo chown -R root:root /path/to/docker/secrets ; sudo chmod -R 600 /path/to/docker/secrets' -# DOCKER TRAEFIK 2 -alias dcrun2='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker compose-t2.yml ' -alias dcfulllogs2='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker compose-t2.yml logs -tf ' -alias dclogs2='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker compose-t2.yml logs -tf --tail="100" ' -alias dcup2='dcrun2 up -d' -alias dcdown2='dcrun2 down' -alias dcrec2='dcrun2 up -d --force-recreate' -alias dcbuild2='dcrun2 build --pull --no-cache' -alias dcstop2='dcrun2 stop' -alias dcrestart2='dcrun2 restart ' -alias dcpull2='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker compose-t2.yml pull' -alias dcedit2='cd /path/to/docker ; nano docker compose-t2.yml' +# DOCKER TRAEFIK +alias dcrun='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker-compose.yml ' +alias dcfulllogs='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker-compose.yml logs -tf ' +alias dclogs='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker-compose.yml logs -tf --tail="100" ' +alias dcup='dcrun up -d' +alias dcdown='dcrun down' +alias dcrec='dcrun up -d --force-recreate' +alias dcbuild='dcrun build --pull --no-cache' +alias dcstop='dcrun stop' +alias dcrestart='dcrun restart ' +alias dcpull='cd /path/to/docker ; sudo docker compose -f /path/to/docker/docker-compose.yml pull' +alias dcedit='cd /path/to/docker ; nano docker-compose.yml' diff --git a/.env.example b/.env.example index ab82cef..23c4b41 100644 --- a/.env.example +++ b/.env.example @@ -101,19 +101,19 @@ WHOAMI_PORT=80 WIREGUARD_CLIENT_PORT=51821 WIREGUARD_PORT=80 -##### t2_proxy network IPs +##### traefik_proxy network IPs ## Example values given, can be whatever IPs are desired ## Traefik IPv4 -T2_PROXY_GATEWAY=10.123.101.1 -T2_PROXY_SUBNET=10.123.101.0/24 +TRAEFIK_PROXY_GATEWAY=10.123.101.1 +TRAEFIK_PROXY_SUBNET=10.123.101.0/24 TRAEFIK_IPV4=10.123.101.254 ## Traefik IPv6 -T2_PROXY_IPV6_SUBNET_PREFIX="${SERVER_ULA_PREFIX}:1" # Replace `1` with a randomly generated 2 byte hexadecimal -T2_PROXY_IPV6_SUBNET="${T2_PROXY_IPV6_SUBNET_PREFIX}::/64" -T2_PROXY_IPV6_GATEWAY="${T2_PROXY_IPV6_SUBNET_PREFIX}::1" -TRAEFIK_IPV6="${T2_PROXY_IPV6_SUBNET_PREFIX}:ffff:ffff:ffff:fffe" +TRAEFIK_PROXY_IPV6_SUBNET_PREFIX="${SERVER_ULA_PREFIX}:1" # Replace `1` with a randomly generated 2 byte hexadecimal +TRAEFIK_PROXY_IPV6_SUBNET="${TRAEFIK_PROXY_IPV6_SUBNET_PREFIX}::/64" +TRAEFIK_PROXY_IPV6_GATEWAY="${TRAEFIK_PROXY_IPV6_SUBNET_PREFIX}::1" +TRAEFIK_IPV6="${TRAEFIK_PROXY_IPV6_SUBNET_PREFIX}:ffff:ffff:ffff:fffe" ## Other IPs BAZARR_IPV4=10.123.101.101 diff --git a/appdata/authentik/config/ak-outpost-ldap-conf.example.yml b/appdata/authentik/config/ak-outpost-ldap-conf.example.yml index 53a18f7..fd59757 100644 --- a/appdata/authentik/config/ak-outpost-ldap-conf.example.yml +++ b/appdata/authentik/config/ak-outpost-ldap-conf.example.yml @@ -20,7 +20,7 @@ docker_labels: traefik.http.services.ak-outpost-ldap-healthcheck-svc.loadbalancer.healthcheck.path: /outpost.goauthentik.io/ping traefik.http.services.ak-outpost-ldap-healthcheck-svc.loadbalancer.healthcheck.port: "" # Likely 9300 authentik_host: https://authentik./ -docker_network: t2_proxy +docker_network: traefik_proxy container_image: null docker_map_ports: false authentik_host_browser: "" diff --git a/backup-scripts/borg-patternfile.example.lst b/backup-scripts/borg-patternfile.example.lst index 67394ad..50f7e1d 100644 --- a/backup-scripts/borg-patternfile.example.lst +++ b/backup-scripts/borg-patternfile.example.lst @@ -33,7 +33,7 @@ R /home//docker + /home//docker/.env - /home//docker/.env.example - /home//docker/.gitignore -+ /home//docker/docker-compose-t2.yml ++ /home//docker/docker-compose.yml - /home//docker/LICENSE - /home//docker/README.md diff --git a/compose/adminer.yml b/compose/adminer.yml index ffaaa7e..2b4da17 100644 --- a/compose/adminer.yml +++ b/compose/adminer.yml @@ -5,7 +5,7 @@ services: container_name: adminer image: adminer:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/audiobookshelf.yml b/compose/audiobookshelf.yml index 5820385..41294b4 100644 --- a/compose/audiobookshelf.yml +++ b/compose/audiobookshelf.yml @@ -5,7 +5,7 @@ services: image: ghcr.io/advplyr/audiobookshelf:latest container_name: audiobookshelf networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/authelia.yml b/compose/authelia.yml index 1a53bd7..81af4cb 100644 --- a/compose/authelia.yml +++ b/compose/authelia.yml @@ -25,7 +25,7 @@ services: ## https://github.com/authelia/authelia#breaking-changes image: ghcr.io/authelia/authelia:4.38 networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/authentik.yml b/compose/authentik.yml index 0826f9c..65ebeb7 100644 --- a/compose/authentik.yml +++ b/compose/authentik.yml @@ -21,7 +21,7 @@ services: container_name: authentik image: ghcr.io/goauthentik/server:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always @@ -99,7 +99,7 @@ services: container_name: authentik-worker image: ghcr.io/goauthentik/server:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/bazarr.yml b/compose/bazarr.yml index e0ab321..e99da06 100644 --- a/compose/bazarr.yml +++ b/compose/bazarr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/bazarr container_name: bazarr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/bluebubbles.yml b/compose/bluebubbles.yml index 8430e4c..bc83b5c 100644 --- a/compose/bluebubbles.yml +++ b/compose/bluebubbles.yml @@ -6,7 +6,7 @@ services: image: sickcodes/docker-osx:ventura container_name: bluebubbles-setup networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:false restart: unless-stopped @@ -36,7 +36,7 @@ services: image: sickcodes/docker-osx:naked container_name: bluebubbles networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:false restart: unless-stopped diff --git a/compose/calibre-web.yml b/compose/calibre-web.yml index 3d734b2..7ed4106 100644 --- a/compose/calibre-web.yml +++ b/compose/calibre-web.yml @@ -6,7 +6,7 @@ services: image: lscr.io/linuxserver/calibre-web:latest container_name: calibre-web networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/calibre.yml b/compose/calibre.yml index 9bb1b3c..20e96d6 100644 --- a/compose/calibre.yml +++ b/compose/calibre.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/calibre:latest container_name: calibre networks: - - t2_proxy + - traefik_proxy security_opt: ## Required for some setups - seccomp:unconfined diff --git a/compose/dozzle.yml b/compose/dozzle.yml index e3c5050..ca5147c 100644 --- a/compose/dozzle.yml +++ b/compose/dozzle.yml @@ -5,7 +5,7 @@ services: image: amir20/dozzle:latest container_name: dozzle networks: - - t2_proxy + - traefik_proxy - socket_proxy security_opt: - no-new-privileges:true diff --git a/compose/duckdns.yml b/compose/duckdns.yml index da8f747..cd316f8 100644 --- a/compose/duckdns.yml +++ b/compose/duckdns.yml @@ -8,7 +8,7 @@ services: image: lscr.io/linuxserver/duckdns:latest container_name: duckdns networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/dupeguru.yml b/compose/dupeguru.yml index 1614465..973e5c0 100644 --- a/compose/dupeguru.yml +++ b/compose/dupeguru.yml @@ -5,7 +5,7 @@ services: image: jlesage/dupeguru:latest container_name: dupeguru networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/filebrowser.yml b/compose/filebrowser.yml index ad4d433..3ae2c28 100644 --- a/compose/filebrowser.yml +++ b/compose/filebrowser.yml @@ -5,7 +5,7 @@ services: image: filebrowser/filebrowser:s6 container_name: filebrowser networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/firefly.yml b/compose/firefly.yml index f7685bd..8ec731e 100644 --- a/compose/firefly.yml +++ b/compose/firefly.yml @@ -22,7 +22,7 @@ services: container_name: firefly image: fireflyiii/core:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped @@ -170,7 +170,7 @@ services: container_name: importer image: fireflyiii/data-importer:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/flaresolverr.yml b/compose/flaresolverr.yml index 963016b..3613619 100644 --- a/compose/flaresolverr.yml +++ b/compose/flaresolverr.yml @@ -6,7 +6,7 @@ services: image: ghcr.io/flaresolverr/flaresolverr:latest container_name: flaresolverr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/glances.yml b/compose/glances.yml index d04e1a8..28ae776 100644 --- a/compose/glances.yml +++ b/compose/glances.yml @@ -6,7 +6,7 @@ services: container_name: glances privileged: true networks: - - t2_proxy + - traefik_proxy - socket_proxy security_opt: - no-new-privileges:true diff --git a/compose/gluetun-private.yml b/compose/gluetun-private.yml index c952fc4..175d9b0 100644 --- a/compose/gluetun-private.yml +++ b/compose/gluetun-private.yml @@ -13,7 +13,7 @@ services: networks: gluetun_net: ipv4_address: $GLUETUN_PRIVATE_IPV4 - t2_proxy: + traefik_proxy: security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/gluetun-temp.yml b/compose/gluetun-temp.yml index 61d5660..166d879 100644 --- a/compose/gluetun-temp.yml +++ b/compose/gluetun-temp.yml @@ -14,7 +14,7 @@ services: networks: gluetun_net: ipv4_address: $GLUETUN_TEMP_IPV4 - t2_proxy: + traefik_proxy: security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/gotify.yml b/compose/gotify.yml index 28bb540..4d616cc 100644 --- a/compose/gotify.yml +++ b/compose/gotify.yml @@ -12,7 +12,7 @@ services: container_name: gotify image: gotify/server:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/guacamole.yml b/compose/guacamole.yml index b00c146..f84ac29 100644 --- a/compose/guacamole.yml +++ b/compose/guacamole.yml @@ -14,7 +14,7 @@ services: image: guacamole/guacamole:latest container_name: guacamole networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always @@ -53,7 +53,7 @@ services: image: guacamole/guacd:latest container_name: guacd networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/handbrake.yml b/compose/handbrake.yml index d2f2d83..0c1ac15 100644 --- a/compose/handbrake.yml +++ b/compose/handbrake.yml @@ -5,7 +5,7 @@ services: image: jlesage/handbrake:latest container_name: handbrake networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/heimdall.yml b/compose/heimdall.yml index 831d134..5cfc6a0 100644 --- a/compose/heimdall.yml +++ b/compose/heimdall.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/heimdall container_name: heimdall networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/jellyfin.yml b/compose/jellyfin.yml index d64f2f8..5cae4b7 100644 --- a/compose/jellyfin.yml +++ b/compose/jellyfin.yml @@ -6,7 +6,7 @@ services: image: jellyfin/jellyfin:latest container_name: jellyfin networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/keycloak.yml b/compose/keycloak.yml index a1f318b..955b7c1 100644 --- a/compose/keycloak.yml +++ b/compose/keycloak.yml @@ -13,7 +13,7 @@ services: keycloak: container_name: keycloak networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/lidarr.yml b/compose/lidarr.yml index bae0e23..71f414f 100644 --- a/compose/lidarr.yml +++ b/compose/lidarr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/lidarr:latest container_name: lidarr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/maintainerr.yml b/compose/maintainerr.yml index 249b6a9..e362d4f 100644 --- a/compose/maintainerr.yml +++ b/compose/maintainerr.yml @@ -5,7 +5,7 @@ services: image: ghcr.io/jorenn92/maintainerr:latest container_name: maintainerr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/mariadb.yml b/compose/mariadb.yml index 4fa8390..72dffe0 100644 --- a/compose/mariadb.yml +++ b/compose/mariadb.yml @@ -10,7 +10,7 @@ services: container_name: mariadb image: lscr.io/linuxserver/mariadb:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/minecraft-rcon.yml b/compose/minecraft-rcon.yml index 32ebb42..aab6a36 100644 --- a/compose/minecraft-rcon.yml +++ b/compose/minecraft-rcon.yml @@ -6,7 +6,7 @@ services: image: itzg/rcon:latest container_name: minecraft-rcon networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/minecraft.yml b/compose/minecraft.yml index b83100b..a642d38 100644 --- a/compose/minecraft.yml +++ b/compose/minecraft.yml @@ -135,7 +135,7 @@ services: # AUTOPAUSE_PERIOD: 10 ## See https://github.com/itzg/docker-minecraft-server/blob/master/README.md#enabling-autopause # AUTOPAUSE_KNOCK_INTERFACE: eth0 - ## enp4s0, eth0, lo, eno1, docker0, br-ab276aa20945, br-4d480c1adff5, t2_proxy + ## enp4s0, eth0, lo, eno1, docker0, br-ab276aa20945, br-4d480c1adff5, traefik_proxy # labels: # - "traefik.enable=true" # ## HTTP Routers diff --git a/compose/nextcloud.yml b/compose/nextcloud.yml index 1797ff7..5827211 100644 --- a/compose/nextcloud.yml +++ b/compose/nextcloud.yml @@ -24,7 +24,7 @@ services: container_name: nextcloud image: nextcloud:29 networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped @@ -61,7 +61,7 @@ services: MAIL_FROM_ADDRESS: admin@drive.$DOMAINNAME0 # MAIL_DOMAIN: NEXTCLOUD_TRUSTED_DOMAINS: drive.$DOMAINNAME0 - TRUSTED_PROXIES: $T2_PROXY_SUBNET + TRUSTED_PROXIES: $TRAEFIK_PROXY_SUBNET secrets: - nextcloud_admin_user - nextcloud_admin_password diff --git a/compose/ombi.yml b/compose/ombi.yml index 7a9f480..6b7d744 100644 --- a/compose/ombi.yml +++ b/compose/ombi.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/ombi:latest container_name: ombi networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/organizr.yml b/compose/organizr.yml index 5825f64..ea3d87d 100644 --- a/compose/organizr.yml +++ b/compose/organizr.yml @@ -5,7 +5,7 @@ services: image: organizr/organizr container_name: organizr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/overseerr.yml b/compose/overseerr.yml index 2417162..e9e25b8 100644 --- a/compose/overseerr.yml +++ b/compose/overseerr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/overseerr:latest container_name: overseerr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/phpmyadmin.yml b/compose/phpmyadmin.yml index a50198d..fc55a60 100644 --- a/compose/phpmyadmin.yml +++ b/compose/phpmyadmin.yml @@ -12,7 +12,7 @@ services: image: phpmyadmin:latest container_name: phpmyadmin networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/pi-hole.yml b/compose/pi-hole.yml index aa23f83..a75cd81 100644 --- a/compose/pi-hole.yml +++ b/compose/pi-hole.yml @@ -7,7 +7,7 @@ services: image: pihole/pihole:latest container_name: pihole networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/plex.yml b/compose/plex.yml index fd587a5..e29c061 100644 --- a/compose/plex.yml +++ b/compose/plex.yml @@ -8,7 +8,7 @@ services: image: lscr.io/linuxserver/plex:latest container_name: plex networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/portfolio.yml b/compose/portfolio.yml index 1637fac..c481f88 100644 --- a/compose/portfolio.yml +++ b/compose/portfolio.yml @@ -9,7 +9,7 @@ services: image: ghcr.io/devben-io/docker-portfolio/docker-portfolio:latest container_name: portfolio networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/postgres.yml b/compose/postgres.yml index 586d1ff..b5aa572 100644 --- a/compose/postgres.yml +++ b/compose/postgres.yml @@ -23,7 +23,7 @@ services: image: postgres:16 user: "${PUID}:${PGID}" networks: - t2_proxy: + traefik_proxy: ipv4_address: $POSTGRES_IPV4 security_opt: - no-new-privileges:true diff --git a/compose/prowlarr.yml b/compose/prowlarr.yml index 7f6cdec..29d2547 100644 --- a/compose/prowlarr.yml +++ b/compose/prowlarr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/prowlarr:develop container_name: prowlarr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/radarr-4k.yml b/compose/radarr-4k.yml index 2d466ae..dadd029 100644 --- a/compose/radarr-4k.yml +++ b/compose/radarr-4k.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/radarr:latest container_name: radarr-4k networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/radarr.yml b/compose/radarr.yml index 634fa44..48235bb 100644 --- a/compose/radarr.yml +++ b/compose/radarr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/radarr:latest container_name: radarr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/redis.yml b/compose/redis.yml index 195ea87..e885b34 100644 --- a/compose/redis.yml +++ b/compose/redis.yml @@ -9,7 +9,7 @@ services: container_name: redis image: redis:latest networks: - t2_proxy: + traefik_proxy: ipv4_address: $REDIS_IPV4 security_opt: - no-new-privileges:true diff --git a/compose/rediscommander.yml b/compose/rediscommander.yml index f7a4237..2ebc56a 100644 --- a/compose/rediscommander.yml +++ b/compose/rediscommander.yml @@ -10,7 +10,7 @@ services: container_name: rediscommander image: ghcr.io/joeferner/redis-commander:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/sonarr-4k.yml b/compose/sonarr-4k.yml index e53c87d..aaca9a2 100644 --- a/compose/sonarr-4k.yml +++ b/compose/sonarr-4k.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/sonarr container_name: sonarr-4k networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/sonarr.yml b/compose/sonarr.yml index a834126..0045e42 100644 --- a/compose/sonarr.yml +++ b/compose/sonarr.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/sonarr container_name: sonarr networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/tautulli.yml b/compose/tautulli.yml index b82c4c2..d955516 100644 --- a/compose/tautulli.yml +++ b/compose/tautulli.yml @@ -5,7 +5,7 @@ services: image: lscr.io/linuxserver/tautulli:latest container_name: tautulli networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/tdarr-node.yml b/compose/tdarr-node.yml index 9e6e4f0..54b3688 100644 --- a/compose/tdarr-node.yml +++ b/compose/tdarr-node.yml @@ -6,7 +6,7 @@ services: image: ghcr.io/haveagitgat/tdarr_node:latest privileged: true networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/tdarr.yml b/compose/tdarr.yml index 2b9efc3..0a9a10e 100644 --- a/compose/tdarr.yml +++ b/compose/tdarr.yml @@ -6,7 +6,7 @@ services: image: ghcr.io/haveagitgat/tdarr:latest privileged: true networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/traefik.yml b/compose/traefik.yml index 622695c..578e56e 100644 --- a/compose/traefik.yml +++ b/compose/traefik.yml @@ -63,7 +63,7 @@ services: ## Pulls main and wildcard cert for second domain # - --entrypoints.https.http.tls.domains[1].main=$DOMAINNAME1 # - --entrypoints.https.http.tls.domains[1].sans=*.$DOMAINNAME1 - - --providers.docker.network=t2_proxy + - --providers.docker.network=traefik_proxy ## Load dynamic configuration from one or more .toml or .yml files in a ## directory - --providers.file.directory=/rules @@ -92,7 +92,7 @@ services: ## Set Authentik LDAPS entrypoint - --entryPoints.authentik-ldaps.address=:$AUTHENTIK_LDAPS_PORT networks: - t2_proxy: + traefik_proxy: ipv4_address: $TRAEFIK_IPV4 # You can specify a static IP socket_proxy: # depends_on: diff --git a/compose/vaultwarden.yml b/compose/vaultwarden.yml index 536fb88..14fa944 100644 --- a/compose/vaultwarden.yml +++ b/compose/vaultwarden.yml @@ -22,7 +22,7 @@ services: container_name: vaultwarden image: vaultwarden/server:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/vscode.yml b/compose/vscode.yml index f2c0458..846edd0 100644 --- a/compose/vscode.yml +++ b/compose/vscode.yml @@ -10,7 +10,7 @@ services: image: lscr.io/linuxserver/code-server:latest container_name: vscode networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/watchtower.yml b/compose/watchtower.yml index 76950fc..43feb62 100644 --- a/compose/watchtower.yml +++ b/compose/watchtower.yml @@ -12,7 +12,7 @@ services: command: -H tcp://socket-proxy:2375 # Set host to socket-proxy networks: - socket_proxy - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: always diff --git a/compose/whoami.yml b/compose/whoami.yml index 6436e36..478d5a9 100644 --- a/compose/whoami.yml +++ b/compose/whoami.yml @@ -6,7 +6,7 @@ services: container_name: whoami image: containous/whoami networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/compose/wireguard.yml b/compose/wireguard.yml index c4e8278..49f1688 100644 --- a/compose/wireguard.yml +++ b/compose/wireguard.yml @@ -5,7 +5,7 @@ services: container_name: wireguard image: lscr.io/linuxserver/wireguard:latest networks: - - t2_proxy + - traefik_proxy security_opt: - no-new-privileges:true restart: unless-stopped diff --git a/docker-compose.yml b/docker-compose.yml index 1750af9..21e0809 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,15 +13,15 @@ ## https://docs.docker.com/config/daemon/ipv6/#use-ipv6-for-the-default-bridge-network networks: - t2_proxy: - name: t2_proxy + traefik_proxy: + name: traefik_proxy driver: bridge enable_ipv6: true ipam: config: - - subnet: $T2_PROXY_SUBNET - gateway: $T2_PROXY_GATEWAY - - subnet: $T2_PROXY_IPV6_SUBNET + - subnet: $TRAEFIK_PROXY_SUBNET + gateway: $TRAEFIK_PROXY_GATEWAY + - subnet: $TRAEFIK_PROXY_IPV6_SUBNET socket_proxy: name: socket_proxy driver: bridge From ad9367683bd2f118c2e2a047660384e8c516f7ea Mon Sep 17 00:00:00 2001 From: trjohnson19 <77356759+trjohnson19@users.noreply.github.com> Date: Wed, 6 Aug 2025 13:29:21 -0500 Subject: [PATCH 2/2] `ENV` linter fix --- .env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.example b/.env.example index 23c4b41..97bf4ab 100644 --- a/.env.example +++ b/.env.example @@ -105,9 +105,11 @@ WIREGUARD_PORT=80 ## Example values given, can be whatever IPs are desired ## Traefik IPv4 +# dotenv-linter:off UnorderedKey TRAEFIK_PROXY_GATEWAY=10.123.101.1 TRAEFIK_PROXY_SUBNET=10.123.101.0/24 TRAEFIK_IPV4=10.123.101.254 +# dotenv-linter:on UnorderedKey ## Traefik IPv6 TRAEFIK_PROXY_IPV6_SUBNET_PREFIX="${SERVER_ULA_PREFIX}:1" # Replace `1` with a randomly generated 2 byte hexadecimal