Update for pihole 6

Pihole 6 uses a different config file format and no longer supports the
setupVars file.
To change settings we need to use the pihole-FTL binary.

Also it now uses an internal webserver instead of lighttp.

Author: narkaTee

inventory/host_vars/nas.yaml

@@ -131,7 +131,7 @@ container_proxy_routes:
     backend: http://192.168.1.10:9093
     icon: https://upload.wikimedia.org/wikipedia/commons/3/38/Prometheus_software_logo.svg
   - title: Pi-hole
-    path: /pihole/
+    path: /pihole/admin
     backend: http://192.168.1.5/admin/
     type: pihole
     icon: https://upload.wikimedia.org/wikipedia/en/1/15/Pi-hole_vector_logo.svg

roles/container-proxy/templates/container-proxy.j2

@@ -6,17 +6,6 @@ map $http_upgrade $connection_upgrade {
 }
 {% endif %}
 
-{% for route in container_proxy_routes %}
-{% if route.type is defined and route.type == "pihole" %}
-map $upstream_http_location $replace_location_{{ route.path.replace('/', '') }} {
-	"" "";
-	"/admin/" "/pihole/";
-	"~^/(.*)$" "/pihole/$1";
-	"~^(.*)$" "/pihole/$1";
-}
-{% endif %}
-{% endfor %}
-
 server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
@@ -46,14 +35,7 @@ server {
 {% elif _type == "pihole" %}
 	location {{ route.path }} {
 		proxy_pass {{ route.backend }};
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_hide_header X-Frame-Options;
-		proxy_set_header X-Frame-Options "SAMEORIGIN";
-		# we need to rewrite the location header pihole returns
-		proxy_hide_header Location;
-		add_header Location $replace_location_{{ route.path.replace('/', '') }};
+		rewrite  ^{{ route.path }}(.*)  /$1 break;
 	}
 {% elif _type == "grafana" %}
 	location {{ route.path.rstrip("/") }}/ {

roles/pihole/defaults/main.yaml

@@ -0,0 +1,3 @@
+pihole_dns_2:
+pihole_dns_3:
+pihole_dns_4:

roles/pihole/tasks/main.yaml

@@ -17,20 +17,26 @@
     mode: "0775"
     state: directory
 
-- name: Create pihole setupvars
-  ansible.builtin.template:
-    src: ./templates/setupVars.conf.j2
-    dest: /etc/pihole/setupVars.conf
-  register: pihole_setupvars
-
 - name: Install pi-hole
   ansible.builtin.command: "'/etc/.pihole/automated install/basic-install.sh' --unattended"
   args:
     creates: /opt/pihole
   register: pihole_install
 
-- name: Reconfigure pi-hole after setupvars change
-  ansible.builtin.command: "'/etc/.pihole/automated install/basic-install.sh' --reconfigure --unattended"
-  when:
-    - not pihole_install.changed
-    - pihole_setupvars.changed
+- name: Set Pi-hole configuration settings
+  ansible.builtin.command:
+    cmd: "pihole-FTL --config {{ item.key }} '{{ item.value }}'"
+  with_items:
+    - { key: "dns.upstreams", value: "{{ [pihole_dns_1, pihole_dns_2, pihole_dns_3, pihole_dns_4]
+        | select('defined')
+        | select('string')
+        | to_json
+        }}"
+    }
+    - { key: "webserver.paths.prefix", value: "/pihole" }
+  register: pihole_config
+
+- name: Set Pi-hole Web password
+  ansible.builtin.command:
+    cmd: "pihole-FTL --config webserver.api.password '{{ pihole_web_password }}'"
+  no_log: true