From 42c80b48948380b853a3a5bbf4b5a0df5eff90dd Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 21 Aug 2022 08:59:43 -0400
Subject: [PATCH] update nameserver playbook to setup for debian bullseye, and
 add new cubox to inventory

---
 ansible-5/playbooks/bootstrap.yaml                     |  8 ++++++--
 ansible-5/roles/ns.xai-corp.net/tasks/dynamic_ip.yml   | 10 +++++++++-
 .../ns.xai-corp.net/templates/xai-corp.net.internal.j2 |  1 +
 .../ns.xai-corp.net/templates/xai-corp.net.reverse.j2  |  5 +----
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ansible-5/playbooks/bootstrap.yaml b/ansible-5/playbooks/bootstrap.yaml
index e31065d..013f018 100644
--- a/ansible-5/playbooks/bootstrap.yaml
+++ b/ansible-5/playbooks/bootstrap.yaml
@@ -1,6 +1,6 @@
 ---
 - name: bootstrap
-  hosts: cubox-m
+  hosts: managed
 #  remote_user: ansible
   gather_facts: false
 #  become: true
@@ -94,10 +94,14 @@
     - name: remove {{item}} user if it exists
       command: userdel -rf {{item}}
       become: true
-      become_user: ansible
       args:
         removes: /home/{{item}}/.bashrc
       loop:
         - debian
         - ubuntu
 
+    - name: fix bullseye-security
+      ansible.builtin.replace:
+        path: /etc/apt/sources.list
+        regexp: '(\s+)bullseye\/updates(\s+.*)?$'
+        replace: '\1bullseye-security\/updates\2'
diff --git a/ansible-5/roles/ns.xai-corp.net/tasks/dynamic_ip.yml b/ansible-5/roles/ns.xai-corp.net/tasks/dynamic_ip.yml
index 35f6126..0f99be2 100644
--- a/ansible-5/roles/ns.xai-corp.net/tasks/dynamic_ip.yml
+++ b/ansible-5/roles/ns.xai-corp.net/tasks/dynamic_ip.yml
@@ -1,10 +1,18 @@
 ---
 # create cronjob to set dynamic ip
 
+- name: Install required packages
+  apt:
+    name: "{{ item }}"
+    state: latest
+  with_items:
+    - cron
+  when: ansible_os_family == "Debian"
+
 - name: create zone edit cronjob
   cron:
     name: zoneedit
-    minute: "*/30"
+    minute: "*/45"
     user: root
     job: 'IP=`curl -s http://api.ipify.org` && wget -O - --http-user=rmorgan15 --http-passwd=D422B334D3768ACD "https://dynamic.zoneedit.com/auth/dynamic.html?host=test.xai-corp.net&dnsto=$IP" &>/dev/null'
     cron_file: zoneedit
diff --git a/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2 b/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
index 35a44ff..ef67559 100644
--- a/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
+++ b/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.internal.j2
@@ -38,6 +38,7 @@ dkhost05                IN A    192.168.4.55
 ns                      IN A    192.168.4.11
 ns01                    IN CNAME    ns
 ns02                    IN CNAME    cubox-i
+ns03                    IN CNAME    cubox-m
 
 ; gluster servers
 ;gluster                 IN A    192.168.4.11
diff --git a/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2 b/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2
index 98f3734..46ac9a9 100644
--- a/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2
+++ b/ansible-5/roles/ns.xai-corp.net/templates/xai-corp.net.reverse.j2
@@ -17,9 +17,6 @@ $ORIGIN 4.168.192.IN-ADDR.ARPA.
 103             IN PTR  xaicorp1.xai-corp.net.
 11              IN PTR  home.xai-corp.net.
 12              IN PTR  cubox-i.xai-corp.net.
+15              IN PTR  cubox-m.xai-corp.net.
 20              IN PTR  garden.xai-corp.net.
 22              IN PTR  home02.xai-corp.net.
-41              IN PTR  dkhost01.xai-corp.net.
-43              IN PTR  dkhost02.xai-corp.net.
-53              IN PTR  dkhost03.xai-corp.net.
-54              IN PTR  dkhost04.xai-corp.net.