Enable PiHole dnsmasq to serve external domains via internal IP.

Author: geeksbsmrt

.github/workflows/deploy-prod.yaml

@@ -101,11 +101,18 @@ jobs:
           fi
           set +a
 
+          # --- PiHole DNSMasq ---
+          DNSMASQ_TEMPLATE_PATH="$GITHUB_WORKSPACE/docker/pihole/dnsmasq.d/05-custom-wildcards.conf.template"
+          DNSMASQ_OUTPUT_PATH="$GITHUB_WORKSPACE/docker/pihole/dnsmasq.d/05-custom-wildcards.conf"
+          echo "Templating custom dnsmasq configuration..."
+          # Ensure envsubst is available on the runner (it should be)
+          envsubst < "${DNSMASQ_TEMPLATE_PATH}" > "${DNSMASQ_OUTPUT_PATH}"
+          echo "dnsmasq configuration templated."
+
+          # --- Prometheus ---
           # Define input and output paths using GITHUB_WORKSPACE directly
           INPUT_TEMPLATE_PATH="$GITHUB_WORKSPACE/docker/prometheus/config/prometheus.yml.template"
           OUTPUT_PROCESSED_PATH="$GITHUB_WORKSPACE/docker/prometheus/config/prometheus.yml"
-
-          # --- Prometheus ---
           echo "Templating Prometheus configuration..."
           echo "Input template: ${INPUT_TEMPLATE_PATH}"
           echo "Output file: ${OUTPUT_PROCESSED_PATH}"

docker/docker-compose.yml

@@ -6,16 +6,15 @@ services:
     restart: unless-stopped
     environment:
       # --- Cloudflare Credentials ---
-      - CF_API_TOKEN=${CLOUDFLARE_API_TOKEN}
+      - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN}
 
       # --- Domains to Update ---
       - DOMAINS=${CF_DDNS_DOMAINS}
 
       # --- Other Settings ---
       - PROXIED=${CF_DDNS_PROXIED}
-      - IP4_PROVIDER=cloudflare.com
-      - IP6_PROVIDER=none
       - UPDATE_CRON=@every 5m
+      - IP6_PROVIDER=none
       - TZ="America/New_York"
 
   pihole:

docker/pihole/dnsmasq.d/05-custom-wildcards.conf.template

@@ -0,0 +1,2 @@
+address=/geeksbsmrt.com/${IP_CADDY}
+address=/smrtgeekdevs.com/${IP_CADDY}

secrets.sops.env

@@ -1,6 +1,9 @@
 #ENC[AES256_GCM,data:2ORmCFiAu3nL,iv:iH7gaw54PNWt0QE2QnDoUXXXkhstZaBYsenk5SBEVQU=,tag:2eqZlsc0AL9QLy5o3s78IA==,type:comment]
-#ENC[AES256_GCM,data:0AWMJZ2GZQ==,iv:COqR99QTH7/RbbNhYEH5JTqMLRmab3DWVXOhucPyRxA=,tag:PiHMQvDCBgV9of6AHBVA+A==,type:comment]
+#ENC[AES256_GCM,data:I0ZCGhGsMJu51oWH,iv:dZCuKv0YrCbkDqAnZqqEdlgbHmOQm7pEhKJmy/EQvDs=,tag:Wygjb7fWFb4d7f8Mgnr/jw==,type:comment]
 CLOUDFLARE_API_TOKEN=ENC[AES256_GCM,data:2utz8XddQapfWlSlDyL/Y52B47WMGYKCDv9OXUL93wM86Gm7Ph0XypYz,iv:SeFY4h+nwCDRauPYJZE7+Ztmj2CQU/sAF5RbUYbzD6o=,tag:j5G42iaJh9RA/Iu/GYldpQ==,type:str]
+CF_DDNS_DOMAINS=ENC[AES256_GCM,data:wLr3qeFoSGlh3FJgc2oYRzKxf3zTdVfxmbErATBBvYA5,iv:JexrsuQC1yFeNPl0IMWOk6Lm6v3cWHXXVgPdWS6qKiM=,tag:UPZmD9oGHstvxZZwuI+myg==,type:str]
+CF_DDNS_PROXIED=ENC[AES256_GCM,data:Gdy1SNkb,iv:r0xNkKlbcaufvl13UDWdsSM4M3n4wosClFMT963Sxp8=,tag:T4g1M6cGUaghI4/QZQvmJg==,type:str]
+#ENC[AES256_GCM,data:0AWMJZ2GZQ==,iv:COqR99QTH7/RbbNhYEH5JTqMLRmab3DWVXOhucPyRxA=,tag:PiHMQvDCBgV9of6AHBVA+A==,type:comment]
 GEEKSBSMRT_EAB_KID=ENC[AES256_GCM,data:3PJrOsjcVdHn2l7jAqx370vmuolf/Sply013EV8RNnHcTg==,iv:P8NDlHfVboIG39lRGzUpUM12YFjuEMsfcjZvRdtB0wM=,tag:r9d4W2sqdkUqAlN2PI9TEw==,type:str]
 GEEKSBSMRT_EAB_MAC=ENC[AES256_GCM,data:oselrPocSzHUmTt4mPRQ446XcBxib31QzuhMX8JcvcLm0WQdkKNYskzOcPlVdRhneylmqfy7KbNEBWLgn89i/+WvJqzG0Hmmtv1R5bcP8XJUzH89E/QYow==,iv:qSjmtC+2SxVaIm5QuzuVkNzNEKqg1/tcZahA0I2c7xI=,tag:d1/TA5A1nTWWfxy9AUSiOg==,type:str]
 SMRTGEEKDEVS_EAB_KID=ENC[AES256_GCM,data:TSFC0Rop6CHltbL9DVNk4mO1R+98YaCjNDUyOlHwQ0zxaw==,iv:FLvSIXfSZLC9c5BGiwblbrh8rfqghPS3XErna8W6TS4=,tag:3TXbM/cDabIojKYvX7CCzQ==,type:str]
@@ -39,7 +42,7 @@ sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb2
 sops_age__list_0__map_recipient=age13pmf2jna228g9n780j7tl63qdws4gdll36rtuvk74nld5pet543q5ch3wf
 sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3VDZzb0IvcXAvcWpRY2pK\nL0txc3ZNVFhSN0NJVCswL05LWHhudHl2eGdZCm9JLy9BNlJrdFVsNlM4WmxNNXdY\nVW1pK3AxOVJvTW1SRWNRUTVUT1BseUEKLS0tIGhXTDE3eG9ucnVuY3dsTW1tbUZq\nTWszMjNwVFA1dUxTaTNUbWRvTkJmWUEKr+qniEgTJ5mBQ0wHGxlMQnj3zNWBdkHZ\nlbpdEQbWsSKAdtPvnKvW//A4gUueemGrTHTBkpiAR8svW5JVlpEImw==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1ryc8jh6xye29kgaxqwy57n7qunxak5w8kdtpgk0lwwjuh3w2gywsha6ja2
-sops_lastmodified=2025-05-31T19:21:43Z
-sops_mac=ENC[AES256_GCM,data:Clr8aWitsOdiUWRFY9WYCPqsR0Z/sKdUFmD658DrlnVEYuVTelLekKr/+fbEHAhBJ4NBxLw1Z80irMrH2R9b/E/NBOnjZJRlDtklQPGERW6AEnoN9OC5CsQjDRZdfjJhjbVtPZ3ISMK0jd5GCxHTotDN4m0Tw2HFhRnIJcyYXfM=,iv:hL7KBNGm7XpdYdV0NPD6CJxkXn4IBUCR6ixjn8h+gMU=,tag:3+xaUpZjzDUN4sm046lfRA==,type:str]
+sops_lastmodified=2025-06-10T02:30:41Z
+sops_mac=ENC[AES256_GCM,data:aOis+/DQ/QUH4v3T+FWLh/6CXF6IpVB3GE7x7XUU/78IV4MfQtcaVjSf2QgnRvzwHW9o6s26hBLxUBQTv/LD6U7F/w9+F01c4Uy0TB/owlNsKsPGVbklLOI273p4L9KqueLgdNCN/MhTVSvWeNToxMPk3LekJfGJiC/Bo45x3k4=,iv:VLMoBBijWvipo4T1dXoh0Rk8vzYzT8z02BoCOLRMhkk=,tag:uICAIpY1oTMmhFxhWQa0Dg==,type:str]
 sops_unencrypted_suffix=_unencrypted
 sops_version=3.10.2