Using rui/mai dns

cradle8810 · Nov 17, 2024 · 053bc1b · 053bc1b
1 parent 36f2705
commit 053bc1b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/main_branch.yml b/.github/workflows/main_branch.yml
@@ -53,7 +53,7 @@ jobs:
       - name: NXDOMAIN_Duplicate_Check
         run: >
           "./dupcheck.sh"
-          "inventories/host_vars/rui/NXDOMAIN.yml"
+          "inventories/host_vars/dns/NXDOMAIN.yml"
 
   Dry_Run_ansible:
     needs:

diff --git a/inventories/host_vars/rui/CNAME.yml → inventories/host_vars/dns/CNAME.yml b/inventories/host_vars/rui/CNAME.yml → inventories/host_vars/dns/CNAME.yml
diff --git a/inventories/host_vars/rui/NXDOMAIN.yml → inventories/host_vars/dns/NXDOMAIN.yml b/inventories/host_vars/rui/NXDOMAIN.yml → inventories/host_vars/dns/NXDOMAIN.yml
diff --git a/inventories/host_vars/mai.yml b/inventories/host_vars/mai.yml
@@ -6,6 +6,10 @@ apt:
   - htop
   - rsyslog
 
+rui_info: "{{ network | selectattr('shortname', 'eq', 'rui') }}"
+rui_ipv4: "{{ rui_info[0].ipv4 }}"
+rui_interface: "{{ rui_info[0].interface }}"
+
 mai_info: "{{ network | selectattr('shortname', 'eq', 'mai') }}"
 mai_ipv4: "{{ mai_info[0].ipv4 }}"
 mai_interface: "{{ mai_info[0].interface }}"
@@ -17,12 +21,12 @@ dnsmasq:
   interface: "{{ mai_interface }}"
   dhcp_range:
     start: 192.168.1.151
-    end: 192.168.1.191
+    end: 192.168.1.199
     netmask: 255.255.255.0
     ttl: "12h"
   dhcp_option:
     ntp_server: 210.130.188.10
-    dns_server: "{{ mai_ipv4 }}"
+    dns_server: "{{ mai_ipv4 }},{{ rui_ipv4 }}"
     router: "{{ subnet.gw4 }}"
     netmask: "255.255.255.0"
   dns:

diff --git a/inventories/host_vars/rui.yml b/inventories/host_vars/rui.yml
@@ -11,6 +11,10 @@ rui_info: "{{ network | selectattr('shortname', 'eq', 'rui') }}"
 rui_ipv4: "{{ rui_info[0].ipv4 }}"
 rui_interface: "{{ rui_info[0].interface }}"
 
+mai_info: "{{ network | selectattr('shortname', 'eq', 'mai') }}"
+mai_ipv4: "{{ mai_info[0].ipv4 }}"
+mai_interface: "{{ mai_info[0].interface }}"
+
 dnsmasq:
   domain: hayaworld.home
   local: /hayaworld.home/
@@ -23,7 +27,7 @@ dnsmasq:
     ttl: "12h"
   dhcp_option:
     ntp_server: 210.130.188.10
-    dns_server: "{{ rui_ipv4 }}"
+    dns_server: "{{ rui_ipv4 }},{{ mai_ipv4 }}"
     router: "{{ subnet.gw4 }}"
     netmask: "255.255.255.0"
   dns:

diff --git a/mai.yml b/mai.yml
@@ -6,8 +6,8 @@
   become: true
 
   vars_files:
-    - inventories/host_vars/rui/NXDOMAIN.yml
-    - inventories/host_vars/rui/CNAME.yml
+    - inventories/host_vars/dns/NXDOMAIN.yml
+    - inventories/host_vars/dns/CNAME.yml
     - inventories/host_vars/mai.yml
     - inventories/host_vars/networks.yml
 

diff --git a/rui.yml b/rui.yml
@@ -6,8 +6,8 @@
   become: true
 
   vars_files:
-    - inventories/host_vars/rui/NXDOMAIN.yml
-    - inventories/host_vars/rui/CNAME.yml
+    - inventories/host_vars/dns/NXDOMAIN.yml
+    - inventories/host_vars/dns/CNAME.yml
     - inventories/host_vars/rui.yml
     - inventories/host_vars/networks.yml