Fix pihole => pi-hole naming convention

apps/pi-hole/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     ports:
       - 53:53
       - 53:53/udp
-      - ${APP_PIHOLE_PORT}:80
+      - ${APP_PI_HOLE_PORT}:80
     volumes:
       - ${APP_DATA_DIR}/data/pihole:/etc/pihole/
       - ${APP_DATA_DIR}/data/dnsmasq:/etc/dnsmasq.d/
@@ -19,4 +19,4 @@ services:
       - WEBPASSWORD=moneyprintergobrrr
     networks:
       default:
-        ipv4_address: $APP_PIHOLE_IP
+        ipv4_address: $APP_PI_HOLE_IP

scripts/configure

@@ -163,8 +163,8 @@ APP_NEXTCLOUD_IP="10.21.21.32"
 APP_NEXTCLOUD_DB_IP="10.21.21.33"
 APP_NEXTCLOUD_REDIS_IP="10.21.21.34"
 APP_NEXTCLOUD_CRON_IP="10.21.21.35"
-APP_PIHOLE_PORT="8082"
+APP_PI_HOLE_PORT="8082"
-APP_PIHOLE_IP="10.21.21.36"
+APP_PI_HOLE_IP="10.21.21.36"
 APP_HOME_ASSISTANT_PORT="8083"
 APP_HOME_ASSISTANT_IP="10.21.21.37"
 APP_GITEA_PORT="8085"
@@ -352,8 +352,8 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
   sed -i "s/<app-nextcloud-db-ip>/${APP_NEXTCLOUD_DB_IP}/g" "${template}"
   sed -i "s/<app-nextcloud-redis-ip>/${APP_NEXTCLOUD_REDIS_IP}/g" "${template}"
   sed -i "s/<app-nextcloud-cron-ip>/${APP_NEXTCLOUD_CRON_IP}/g" "${template}"
-  sed -i "s/<app-pihole-port>/${APP_PIHOLE_PORT}/g" "${template}"
+  sed -i "s/<app-pi-hole-port>/${APP_PI_HOLE_PORT}/g" "${template}"
-  sed -i "s/<app-pihole-ip>/${APP_PIHOLE_IP}/g" "${template}"
+  sed -i "s/<app-pi-hole-ip>/${APP_PI_HOLE_IP}/g" "${template}"
   sed -i "s/<app-home-assistant-port>/${APP_HOME_ASSISTANT_PORT}/g" "${template}"
   sed -i "s/<app-home-assistant-ip>/${APP_HOME_ASSISTANT_IP}/g" "${template}"
   sed -i "s/<app-gitea-port>/${APP_GITEA_PORT}/g" "${template}"

templates/.env-sample

@@ -66,8 +66,8 @@ APP_NEXTCLOUD_IP=<app-nextcloud-ip>
 APP_NEXTCLOUD_DB_IP=<app-nextcloud-db-ip>
 APP_NEXTCLOUD_REDIS_IP=<app-nextcloud-redis-ip>
 APP_NEXTCLOUD_CRON_IP=<app-nextcloud-cron-ip>
-APP_PIHOLE_PORT=<app-pihole-port>
+APP_PI_HOLE_PORT=<app-pi-hole-port>
-APP_PIHOLE_IP=<app-pihole-ip>
+APP_PI_HOLE_IP=<app-pi-hole-ip>
 APP_HOME_ASSISTANT_PORT=<app-home-assistant-port>
 APP_HOME_ASSISTANT_IP=<app-home-assistant-ip>
 APP_GITEA_PORT=<app-gitea-port>

templates/torrc-sample

@@ -93,9 +93,9 @@ HiddenServicePort 80 <app-bluewallet-lndhub-ip>:<app-bluewallet-lndhub-port>
 HiddenServiceDir /var/lib/tor/app-nextcloud
 HiddenServicePort 80 <app-nextcloud-ip>:80
 
-# pihole Hidden Service
+# pi-hole Hidden Service
-HiddenServiceDir /var/lib/tor/app-pihole
+HiddenServiceDir /var/lib/tor/app-pi-hole
-HiddenServicePort 80 <app-pihole-ip>:80
+HiddenServicePort 80 <app-pi-hole-ip>:80
 
 # home-assistant Hidden Service
 HiddenServiceDir /var/lib/tor/app-home-assistant