From 36a2d3542c088a508c7ca6c8ccfb1ebfd030c322 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Thu, 1 Sep 2022 16:39:28 -0500
Subject: [PATCH] Remove name server roles

---
 group_vars/name_servers/main.yaml | 57 -------------------------------
 inventory.yaml                    |  3 --
 playbook.yaml                     |  7 +---
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 group_vars/name_servers/main.yaml

diff --git a/group_vars/name_servers/main.yaml b/group_vars/name_servers/main.yaml
deleted file mode 100644
index 50c4839..0000000
--- a/group_vars/name_servers/main.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-nsd_linode_xfr:
-  - "{{ lookup('dig', 'axfr1.linode.com.') }}"
-  - "{{ lookup('dig', 'axfr2.linode.com.') }}"
-  - "{{ lookup('dig', 'axfr3.linode.com.') }}"
-  - "{{ lookup('dig', 'axfr4.linode.com.') }}"
-  - "{{ lookup('dig', 'axfr5.linode.com.') }}"
-  - "{{ lookup('dig', 'axfr1.linode.com./AAAA') }}"
-  - "{{ lookup('dig', 'axfr2.linode.com./AAAA') }}"
-  - "{{ lookup('dig', 'axfr3.linode.com./AAAA') }}"
-  - "{{ lookup('dig', 'axfr4.linode.com./AAAA') }}"
-  - "{{ lookup('dig', 'axfr5.linode.com./AAAA') }}"
-
-nsd_provide_xfr:
-  - "{{ lookup('dig', 'axfr1.linode.com.') }} NOKEY"
-  - "{{ lookup('dig', 'axfr2.linode.com.') }} NOKEY"
-  - "{{ lookup('dig', 'axfr3.linode.com.') }} NOKEY"
-  - "{{ lookup('dig', 'axfr4.linode.com.') }} NOKEY"
-  - "{{ lookup('dig', 'axfr5.linode.com.') }} NOKEY"
-  - "{{ lookup('dig', 'axfr1.linode.com./AAAA') }} NOKEY"
-  - "{{ lookup('dig', 'axfr2.linode.com./AAAA') }} NOKEY"
-  - "{{ lookup('dig', 'axfr3.linode.com./AAAA') }} NOKEY"
-  - "{{ lookup('dig', 'axfr4.linode.com./AAAA') }} NOKEY"
-  - "{{ lookup('dig', 'axfr5.linode.com./AAAA') }} NOKEY"
-
-firewall_dns_whitelist: "{{ nsd_linode_xfr }}"
-firewall_ipset_dns: "{{ nsd_linode_xfr }}"
-
-nsd_zones:
-  - name: cavi.cc
-    zonefile: cavi.cc.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: kill0.net
-    zonefile: kill0.net.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: kill0.com
-    zonefile: kill0.com.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: chill9.com
-    zonefile: chill9.com.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: chill9.net
-    zonefile: chill9.net.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: confabulator.net
-    zonefile: confabulator.net.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
-  - name: ctrl-v.org
-    zonefile: ctrl-v.org.zone
-    provide-xfr: "{{ nsd_provide_xfr }}"
-    notify: "{{ nsd_provide_xfr }}"
diff --git a/inventory.yaml b/inventory.yaml
index ab9d7b8..2bfb7bf 100644
--- a/inventory.yaml
+++ b/inventory.yaml
@@ -21,9 +21,6 @@ all:
     monitor_servers:
       hosts:
         jump0.kill0.net
-    name_servers:
-      hosts:
-        jump0.kill0.net
     linode:
       hosts:
         mine0.kill0.net:
diff --git a/playbook.yaml b/playbook.yaml
index 7051b64..c877ad7 100644
--- a/playbook.yaml
+++ b/playbook.yaml
@@ -3,13 +3,13 @@
   become: true
   roles:
     - common
+    - network
     - util
     - sudo
     - hostsfile
     - certs
     - rsyslog
     - users
-    - network
     - dns
     - firewall
     - openssh
@@ -42,7 +42,6 @@
   roles:
     - nginx
     - certbot
-    - influxdb
     - grafana
 - hosts: monitor_servers
   become: true
@@ -65,9 +64,5 @@
       tags:
         - thanos
         - monitoring
-- hosts: name_servers
-  become: true
-  roles:
-    - nsd
 
 # vim:ft=yaml.ansible: