diff --git a/docker-compose.yml b/docker-compose.yml index 8160a4c..0168cf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ networks: ipam: driver: default config: - - subnet: 10.1.0.0/24 + - subnet: 10.2.0.0/24 services: unbound: @@ -15,11 +15,12 @@ services: ports: - "53/tcp" - "53/udp" + hostname: "unbound" volumes: - "./unbound:/opt/unbound/etc/unbound/" networks: private_network: - ipv4_address: 10.1.0.200 + ipv4_address: 10.2.0.200 wireguard: depends_on: [unbound, pihole] @@ -31,11 +32,10 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=America/Los_Angeles - # - SERVERURL=wireguard.domain.com #optional - - SERVERPORT=51820 #optional - - PEERS=1 #optional - How many peers to generate for you (clients) - - PEERDNS=10.1.0.100 # Set it to point to pihole + - TZ=America/Los_Angeles # Change to your timezone + - SERVERPORT=51820 + - PEERS=1 # How many peers to generate for you (clients) + - PEERDNS=10.2.0.100 # Set it to point to pihole - INTERNAL_SUBNET=10.6.0.0 volumes: @@ -44,35 +44,36 @@ services: ports: - "51820:51820/udp" dns: - - 10.1.0.100 + - 10.2.0.100 # Points to pihole + - 10.2.0.200 # Points to unbound sysctls: - net.ipv4.conf.all.src_valid_mark=1 restart: unless-stopped networks: private_network: - ipv4_address: 10.1.0.3 + ipv4_address: 10.2.0.3 pihole: depends_on: [unbound] container_name: pihole image: pihole/pihole:latest restart: unless-stopped - privileged: true + hostname: pihole ports: - - "53:53/tcp" - - "53:53/udp" + - "53/tcp" + - "53/udp" # - "67:67/udp" # Uncomment for pihole dhcp - - "80:80/tcp" - - "443:443/tcp" + - "80/tcp" + - "443/tcp" dns: - 127.0.0.1 - - 10.1.0.200 # Points to unbound + - 10.2.0.200 # Points to unbound environment: TZ: "America/Los_Angeles" WEBPASSWORD: "" # Blank password - Can be whatever you want. - ServerIP: 10.1.0.100 - DNS1: 10.1.0.200 # Unbound IP - DNS2: 10.1.0.200 # If we don't specify two, it will auto pick google. + ServerIP: 10.1.0.100 # Internal IP of pihole + DNS1: 10.2.0.200 # Unbound IP + DNS2: 10.2.0.200 # If we don't specify two, it will auto pick google. # Volumes store your data between container upgrades volumes: - "./etc-pihole/:/etc/pihole/" @@ -83,4 +84,4 @@ services: - NET_ADMIN networks: private_network: - ipv4_address: 10.1.0.100 + ipv4_address: 10.2.0.100 diff --git a/unbound/unbound.conf b/unbound/unbound.conf index f0bd343..26d87b3 100644 --- a/unbound/unbound.conf +++ b/unbound/unbound.conf @@ -302,7 +302,7 @@ # control-enable: no server: - verbosity: 1 + verbosity: 5 num-threads: 3 interface: 0.0.0.0@53 so-reuseport: yes