Replace more app names with variables in templates.

GhostWriters · Sep 17, 2024 · 57a2572 · 57a2572
1 parent 7d6fd6b
commit 57a2572
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 28 deletions.
diff --git a/compose/.apps/airdcpp/airdcpp.yml b/compose/.apps/airdcpp/airdcpp.yml
@@ -2,14 +2,14 @@ services:
   ${_appname_}:
     container_name: ${${_APPNAME_}_CONTAINER_NAME}
     environment:
-      - HTTP_PORT=${AIRDCPP_PORT_5600}
-      - HTTPS_PORT=${AIRDCPP_PORT_5601}
+      - HTTP_PORT=${${_APPNAME_}_PORT_5600}
+      - HTTPS_PORT=${${_APPNAME_}_PORT_5601}
       - PGID=${PGID}
       - PUID=${PUID}
-      - TCP_PORT=${AIRDCPP_PORT_21248}
-      - TLS_PORT=${AIRDCPP_PORT_21249}
+      - TCP_PORT=${${_APPNAME_}_PORT_21248}
+      - TLS_PORT=${${_APPNAME_}_PORT_21249}
       - TZ=${TZ}
-      - UDP_PORT=${AIRDCPP_PORT_21248}
+      - UDP_PORT=${${_APPNAME_}_PORT_21248}
     restart: ${${_APPNAME_}_RESTART}
     volumes:
       - /etc/localtime:/etc/localtime:ro

diff --git a/compose/.apps/filebrowser/filebrowser.yml b/compose/.apps/filebrowser/filebrowser.yml
@@ -9,7 +9,7 @@ services:
     healthcheck:
       test:
         - CMD-SHELL
-        - curl -fs http://localhost:${FILEBROWSER_PORT_80}/health || exit 1
+        - curl -fs http://localhost:${${_APPNAME_}_PORT_80}/health || exit 1
     restart: ${${_APPNAME_}_RESTART}
     user: ${PUID}:${PGID}
     volumes:

diff --git a/compose/.apps/flaresolverr/flaresolverr.ports.yml b/compose/.apps/flaresolverr/flaresolverr.ports.yml
@@ -1,4 +1,4 @@
 services:
   ${_appname_}:
     ports:
-      - ${${_APPNAME_}_PORT_8191}:${FLARESOLVERR_PORT_8191}
+      - ${${_APPNAME_}_PORT_8191}:${${_APPNAME_}_PORT_8191}
diff --git a/compose/.apps/flaresolverr/flaresolverr.yml b/compose/.apps/flaresolverr/flaresolverr.yml
@@ -5,7 +5,7 @@ services:
       - CAPTCHA_SOLVER=${${_APPNAME_}_ENVIRONMENT_CAPTCHA_SOLVER}
       - LOG_HTML=${${_APPNAME_}_ENVIRONMENT_LOG_HTML}
       - LOG_LEVEL=${${_APPNAME_}_ENVIRONMENT_LOG_LEVEL}
-      - PORT=${FLARESOLVERR_PORT_8191}
+      - PORT=${${_APPNAME_}_PORT_8191}
       - TZ=${TZ}
     restart: ${${_APPNAME_}_RESTART}
     volumes:

diff --git a/compose/.apps/omadacontroller/omadacontroller.yml b/compose/.apps/omadacontroller/omadacontroller.yml
@@ -2,15 +2,15 @@ services:
   ${_appname_}:
     container_name: ${${_APPNAME_}_CONTAINER_NAME}
     environment:
-      - MANAGE_HTTP_PORT=${OMADACONTROLLER_PORT_8088}
-      - MANAGE_HTTPS_PORT=${OMADACONTROLLER_PORT_8043}
+      - MANAGE_HTTP_PORT=${${_APPNAME_}_PORT_8088}
+      - MANAGE_HTTPS_PORT=${${_APPNAME_}_PORT_8043}
       - PGID=${PGID}
-      - PORT_ADOPT_V1=${OMADACONTROLLER_PORT_29812}
-      - PORT_APP_DISCOVERY=${OMADACONTROLLER_PORT_27001}
-      - PORT_DISCOVERY=${OMADACONTROLLER_PORT_29810}
-      - PORT_MANAGER_V1=${OMADACONTROLLER_PORT_29811}
-      - PORT_MANAGER_V2=${OMADACONTROLLER_PORT_29814}
-      - PORT_UPGRADE_V1=${OMADACONTROLLER_PORT_29813}
+      - PORT_ADOPT_V1=${${_APPNAME_}_PORT_29812}
+      - PORT_APP_DISCOVERY=${${_APPNAME_}_PORT_27001}
+      - PORT_DISCOVERY=${${_APPNAME_}_PORT_29810}
+      - PORT_MANAGER_V1=${${_APPNAME_}_PORT_29811}
+      - PORT_MANAGER_V2=${${_APPNAME_}_PORT_29814}
+      - PORT_UPGRADE_V1=${${_APPNAME_}_PORT_29813}
       - PUID=${PUID}
       - SHOW_MONGODB_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_MONGODB_LOGS}
       - SHOW_SERVER_LOGS=${${_APPNAME_}_ENVIRONMENT_SHOW_SERVER_LOGS}

diff --git a/compose/.apps/pihole/pihole.ports.yml b/compose/.apps/pihole/pihole.ports.yml
@@ -3,6 +3,6 @@ services:
     ports:
       - ${${_APPNAME_}_PORT_443}:443
       - ${${_APPNAME_}_PORT_80}:80
-      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_53}:53
-      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_53}:53/udp
-      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${PIHOLE_PORT_67}:67/udp
+      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53
+      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_53}:53/udp
+      - ${${_APPNAME_}_ENVIRONMENT_SERVERIP}:${${_APPNAME_}_PORT_67}:67/udp
diff --git a/compose/.apps/qbittorrent/qbittorrent.ports.yml b/compose/.apps/qbittorrent/qbittorrent.ports.yml
@@ -5,4 +5,4 @@ services:
       - ${${_APPNAME_}_PORT_51413}:51413/udp
       - ${${_APPNAME_}_PORT_6881}:6881
       - ${${_APPNAME_}_PORT_6881}:6881/udp
-      - ${${_APPNAME_}_PORT_8080}:${QBITTORRENT_PORT_8080}
+      - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080}
diff --git a/compose/.apps/qbittorrent/qbittorrent.yml b/compose/.apps/qbittorrent/qbittorrent.yml
@@ -5,7 +5,7 @@ services:
       - PGID=${PGID}
       - PUID=${PUID}
       - TZ=${TZ}
-      - WEBUI_PORT=${QBITTORRENT_PORT_8080}
+      - WEBUI_PORT=${${_APPNAME_}_PORT_8080}
     restart: ${${_APPNAME_}_RESTART}
     volumes:
       - /etc/localtime:/etc/localtime:ro

diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml
@@ -3,5 +3,5 @@ services:
     ports:
       - ${${_APPNAME_}_PORT_6881}:6881
       - ${${_APPNAME_}_PORT_6881}:6881/udp
-      - ${${_APPNAME_}_PORT_8080}:${QBITTORRENTVPN_PORT_8080}
+      - ${${_APPNAME_}_PORT_8080}:${${_APPNAME_}_PORT_8080}
       - ${${_APPNAME_}_PORT_8118}:8118
diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml
@@ -19,7 +19,7 @@ services:
       - VPN_PASS=${${_APPNAME_}_ENVIRONMENT_VPN_PASS}
       - VPN_PROV=${${_APPNAME_}_ENVIRONMENT_VPN_PROV}
       - VPN_USER=${${_APPNAME_}_ENVIRONMENT_VPN_USER}
-      - WEBUI_PORT=${QBITTORRENTVPN_PORT_8080}
+      - WEBUI_PORT=${${_APPNAME_}_PORT_8080}
     privileged: true
     restart: ${${_APPNAME_}_RESTART}
     sysctls:

diff --git a/compose/.apps/tdarr/tdarr.yml b/compose/.apps/tdarr/tdarr.yml
@@ -5,9 +5,9 @@ services:
       - PGID=${PGID}
       - PUID=${PUID}
       - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP}
-      - serverPort=${TDARR_PORT_8266}
+      - serverPort=${${_APPNAME_}_PORT_8266}
       - TZ=${TZ}
-      - webUIPort=${TDARR_PORT_8265}
+      - webUIPort=${${_APPNAME_}_PORT_8265}
     restart: ${${_APPNAME_}_RESTART}
     volumes:
       - /etc/localtime:/etc/localtime:ro

diff --git a/compose/.apps/tdarrnode/tdarrnode.yml b/compose/.apps/tdarrnode/tdarrnode.yml
@@ -4,7 +4,7 @@ services:
     environment:
       - nodeID=${${_APPNAME_}_ENVIRONMENT_NODEID}
       - nodeIP=${${_APPNAME_}_ENVIRONMENT_NODEIP}
-      - nodePort=${TDARRNODE_PORT_8267}
+      - nodePort=${${_APPNAME_}_PORT_8267}
       - PGID=${PGID}
       - PUID=${PUID}
       - serverIP=${${_APPNAME_}_ENVIRONMENT_SERVERIP}

diff --git a/compose/.apps/wireguard/wireguard.ports.yml b/compose/.apps/wireguard/wireguard.ports.yml
@@ -1,4 +1,4 @@
 services:
   ${_appname_}:
     ports:
-      - ${${_APPNAME_}_PORT_51820}:${WIREGUARD_PORT_51820}/udp
+      - ${${_APPNAME_}_PORT_51820}:${${_APPNAME_}_PORT_51820}/udp
diff --git a/compose/.apps/wireguard/wireguard.yml b/compose/.apps/wireguard/wireguard.yml
@@ -11,7 +11,7 @@ services:
       - PEERS=${${_APPNAME_}_ENVIRONMENT_PEERS}
       - PGID=${PGID}
       - PUID=${PUID}
-      - SERVERPORT=${WIREGUARD_PORT_51820}
+      - SERVERPORT=${${_APPNAME_}_PORT_51820}
       - SERVERURL=${${_APPNAME_}_ENVIRONMENT_SERVER_URL}
       - TZ=${TZ}
     restart: ${${_APPNAME_}_RESTART}