split dns nameserver into different role

playbook.yml

@@ -3,6 +3,7 @@
   become: yes
   roles:
     - base
+    - ffhl_nameserver
 
 - hosts: kaisertor
   become: yes

roles/base/files/powerdns/recursor.lua

--- Debian default Lua configuration file for PowerDNS Recursor
-
--- Load DNSSEC root keys from dns-root-data package.
--- Note: If you provide your own Lua configuration file, consider
--- running rootkeys.lua too.
-dofile("/usr/share/pdns-recursor/lua-config/rootkeys.lua")
-

roles/base/tasks/main.yml

 ---
 - name: copy base configs
-  tags: [base, etc, apt, powerdns]
+  tags: [base, etc, apt]
   copy:
     src: etc/
     dest: /etc
 
 - name: copy scripts
-  tags: [base, powerdns]
+  tags: [base]
   copy:
     src: scripts/
     dest: /usr/local/lib/ffhl/
@@ -101,8 +101,6 @@
   tags: [network, radvd]
 - include: dhcpd.yml
   tags: [network, dhcp]
-- include: powerdns.yml
-  tags: [powerdns, network]
 
 - include: bird.yml
   tags: [bird]

roles/base/files/scripts/update-dns.sh → roles/ffhl_nameserver/files/scripts/update-dns.sh

@@ -9,6 +9,6 @@ mkdir -p "$DEST"
 git clone "$REPO" "$DIR"
 git --git-dir="$DIR/.git" --work-tree="$DEST" reset --hard
 
-rm -rf $DIR
+rm -rf "$DIR"
 
 pdns_control reload

roles/ffhl_nameserver/tasks/main.yml

+---
+
+- name: install packages
+  tags: [dns, powerdns]
+  apt:
+    state: latest
+    name:
+      - dnsdist
+      - pdns-recursor
+      - pdns-server
+      - pdns-backend-bind
+
+
+- include: powerdns.yml
+  tags: [powerdns]

roles/base/tasks/powerdns.yml → roles/ffhl_nameserver/tasks/powerdns.yml

 ---
 
-- name: install packages
-  apt:
-    autoremove: yes
-    update_cache: yes
-    state: latest
-    name:
-      - dnsdist
-      - pdns-recursor
-      - pdns-server
-      - pdns-backend-bind
 
-- name: copy powerdns configs
+- name: copy systemd services and timers
   copy:
-    src: powerdns
-    dest: /etc/
+    src: systemd/
+    dest: /etc/systemd/system/
 
 - name: copy dnsdist configs
   copy:
     src: dnsdist
     dest: /etc/
 
-- name: clone dns-repo
-  git:
-    repo: "{{ dns_repo_url }}"
-    dest: /var/local/ffhl-dns
-    accept_hostkey: yes
-    version: HEAD
-
 - name: remove default bind-backend config
   file:
     path: /etc/powerdns/pdns.d/bind.conf
     state: absent
 
+- name: remove old dns repo
+  file:
+    path: /var/local/ffhl-dns
+    state: absent
+
+
 - name: restart powerdns
   systemd:
     daemon_reload: yes
@@ -42,6 +31,6 @@
   with_items:
     - pdns-recursor.service
     - pdns.service
-    - update-ffhl-dns.timer
     - dnsdist.service
+    - update-ffhl-dns.timer
     - update-ffhl-dns.service