Merge custom dnsmasq config into pihole

ansible/roles/docker/files/dnsmasq/dnsmasq.conf

@@ -1,7 +0,0 @@
-bogus-priv
-keep-in-foreground
-server=1.1.1.1
-server=1.0.0.1
-port=53
-expand-hosts
-addn-hosts=/etc/dnsmasq-hosts.conf

ansible/roles/docker/files/dnsmasq/docker-compose.yml

@@ -1,11 +0,0 @@
-version: "2.3"
-services:
-  vpn-dns:
-    image: programster/dnsmasq:latest
-    container_name: vpn-dns
-    ports:
-      - "{{ wireguard.clients.intersect.ip }}:53:53/udp"
-    volumes:
-      - ./dnsmasq.conf:/etc/dnsmasq.conf:ro
-      - ./vpn-hosts.conf:/etc/dnsmasq-hosts.conf:ro
-    restart: unless-stopped

ansible/roles/docker/files/dnsmasq/vpn-hosts.conf

@@ -1,3 +0,0 @@
-{% for host in internal_hostnames %}
-{{ wireguard.clients.intersect.ip }} {{ host }}
-{% endfor %}

ansible/roles/docker/files/pihole/dnsmasq-vpn.conf

@@ -0,0 +1,3 @@
+{% for host in internal_hostnames %}
+host-record={{ host }},{{ wireguard.clients.intersect.ip }}
+{% endfor %}

ansible/roles/docker/files/pihole/docker-compose.yml

@@ -5,14 +5,14 @@ services:
     container_name: pihole
     image: pihole/pihole:v4.4
     ports:
-      - "{{ wireguard.clients.intersect.ip }}:5353:53/tcp"
-      - "{{ wireguard.clients.intersect.ip }}:5353:53/udp"
+      - "{{ wireguard.clients.intersect.ip }}:53:53/tcp"
+      - "{{ wireguard.clients.intersect.ip }}:53:53/udp"
     environment:
       - TZ=Europe/London
       - VIRTUAL_HOST=pihole.jakehoward.tech
     volumes:
-      - ./etc-pihole/:/etc/pihole/
-      - ./etc-dnsmasq.d/:/etc/dnsmasq.d/
+      - ./pihole/:/etc/pihole/
+      - ./dnsmasq.d/:/etc/dnsmasq.d/
     restart: unless-stopped
     labels:
       - "traefik.enable=true"