Merge custom dnsmasq config into pihole

ansible/roles/docker/tasks/dnsmasq.yml

@@ -1,54 +0,0 @@
-- name: Include dnsmasq variables
-  include_vars: dnsmasq.yml
-
-- name: Create dnsmasq directory
-  file:
-    path: '/opt/dnsmasq'
-    state: directory
-    owner: "{{ docker_user.name }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-  become_user: root
-
-- name: Install dnsmasq compose file
-  template:
-    src: files/dnsmasq/docker-compose.yml
-    dest: "/opt/dnsmasq/docker-compose.yml"
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-    validate: /usr/bin/docker-compose -f %s config
-  register: compose_file
-  become: true
-  become_user: root
-
-- name: Install dnsmasq config
-  template:
-    src: files/dnsmasq/dnsmasq.conf
-    dest: "/opt/dnsmasq/dnsmasq.conf"
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-  register: dnsmasq_config
-  become: true
-  become_user: root
-
-- name: Install dnsmasq vpn hosts
-  template:
-    src: files/dnsmasq/vpn-hosts.conf
-    dest: "/opt/dnsmasq/vpn-hosts.conf"
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ docker_user.name }}"
-  register: dnsmasq_vpn_hosts
-  become: true
-  become_user: root
-
-- name: Cycle dnsmasq container
-  docker_compose:
-    project_src: /opt/dnsmasq
-    pull: true
-    remove_orphans: true
-    remove_volumes: true
-    state: "{{ item }}"
-  when: compose_file.changed or dnsmasq_config.changed or dnsmasq_vpn_hosts.changed
-  loop:
-    - absent
-    - present

ansible/roles/docker/tasks/main.yml

@@ -13,9 +13,6 @@
 - name: Install portainer
   include: portainer.yml
 
-- name: Install dnsmasq
-  include: dnsmasq.yml
-
 - name: Install whoami
   include: whoami.yml
 

ansible/roles/docker/tasks/pihole.yml

@@ -1,3 +1,6 @@
+- name: Include pihole variables
+  include_vars: pihole.yml
+
 - name: Create pihole directory
   file:
     path: '/opt/pihole'
@@ -18,6 +21,24 @@
   become: true
   become_user: root
 
+- name: Create dnsmasq directory
+  file:
+    path: '/opt/pihole/dnsmasq.d/'
+    state: directory
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+  become_user: root
+
+- name: Install dnsmasq hosts config
+  template:
+    src: files/pihole/dnsmasq-vpn.conf
+    dest: "/opt/pihole/dnsmasq.d/02-vpn.conf"
+    mode: "{{ docker_compose_file_mask }}"
+    owner: "{{ docker_user.name }}"
+  register: dnsmasq_vpn_hosts
+  become: true
+  become_user: root
+
 - name: Cycle pihole container
   docker_compose:
     project_src: /opt/pihole
@@ -25,7 +46,7 @@
     remove_orphans: true
     remove_volumes: true
     state: "{{ item }}"
-  when: compose_file.changed
+  when: compose_file.changed or dnsmasq_vpn_hosts.changed
   loop:
     - absent
     - present