Merge pull request #132 from trjohnson19/trjohnson19/2025-08-06-remove-t2

Purge `traefik2` / `t2` / ... from repo

Author: trjohnson19

.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'

.env.example

@@ -101,19 +101,21 @@ 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
+# 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
-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

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: "<AUTHENTIK_LDAP_HEALTHCHECK_PORT>" # Likely 9300
 authentik_host: https://authentik.<DOMAINNAME0>/
-docker_network: t2_proxy
+docker_network: traefik_proxy
 container_image: null
 docker_map_ports: false
 authentik_host_browser: ""

backup-scripts/borg-patternfile.example.lst

@@ -33,7 +33,7 @@ R /home/<USER>/docker
 + /home/<USER>/docker/.env
 - /home/<USER>/docker/.env.example
 - /home/<USER>/docker/.gitignore
-+ /home/<USER>/docker/docker-compose-t2.yml
++ /home/<USER>/docker/docker-compose.yml
 - /home/<USER>/docker/LICENSE
 - /home/<USER>/docker/README.md
 

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

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

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

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

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

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