From 82f84f8b049b06ee9027bb4ac5780cbfe87aff6f Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Tue, 25 Mar 2025 13:31:57 -0400
Subject: [PATCH] feat: Changes network configuration.

---
 compose.yaml | 28 ++++++++--------------------
 example.env  |  2 +-
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index be7731a..cf9ec98 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -6,11 +6,9 @@ services:
     ports:
       - "53:53/tcp"
       - "53:53/udp"
-      - "8088:80/tcp"
+      - "8088:80/tcp" # remove when integrated into the proxy.
     networks:
-      pihole_network:
-        ipv4_address: 192.168.50.198
-        priority: 1000
+      proxy: {}
       pihole_bridge:
         ipv4_address: 192.168.100.2
         priority: 900
@@ -29,11 +27,11 @@ services:
     container_name: unbound
     restart: unless-stopped
     ports:
-      - "53:53/tcp"
-      - "53:53/udp"
+      - "5053:53/tcp"
+      - "5053:53/udp"
     networks:
-      pihole_network:
-        ipv4_address: 192.168.50.199
+      pihole_bridge:
+        ipv4_address: 192.168.100.3
     volumes:
       - unbound_data:/opt/unbound/etc/unbound
 
@@ -43,19 +41,9 @@ networks:
     ipam:
       config:
         - subnet: 192.168.100.0/24
-          gateway: 192.168.100.1
-          ip_range: 192.168.100.2/32
 
-  pihole_network:
-    name: pihole_network
-    driver: macvlan
-    driver_opts:
-      parent: end0
-    ipam:
-      config:
-        - subnet: 192.168.50.0/24
-          ip_range: 192.168.50.0/24
-          gateway: 192.168.50.1
+  proxy:
+    external: true
 
 volumes:
   pihole_data:
diff --git a/example.env b/example.env
index f248a77..aea3e97 100644
--- a/example.env
+++ b/example.env
@@ -3,7 +3,7 @@ TZ="America/New_York"
 WEBPASSWORD="super-secret!"
 DNSMASQ_LISTENING=local
 # This should be the server IP that pihole is running on.
-PIHOLE_DNS_="192.168.50.5#5053"
+PIHOLE_DNS_="192.168.100.3#5053"
 # This mount needs (3) folders, 'pihole', 'dnsmasq.d', 'unbound'.
 NFS_MNT=":/var/nfs/shared/<mnt>"
 NFS_ADDR="192.168.1.105"