فهرست منبع

Change DNS servers in radv, use v6 only for NTP

Markus Lindenberg 8 سال پیش
والد
کامیت
5cf853b769
2فایلهای تغییر یافته به همراه2 افزوده شده و 10 حذف شده
  1. 1 4
      roles/mesh-batman/templates/batman6.conf.j2
  2. 1 6
      roles/service-dns/templates/unbound.conf.j2

+ 1 - 4
roles/mesh-batman/templates/batman6.conf.j2

@@ -4,10 +4,7 @@ protocol direct bat0 {
 
 protocol radv ra_bat0 {
 	interface "bat0";
-	rdnss {{mesh_ipv6_address|ipaddr('address')}};
 {% for host in groups['supernodes'] %}
-{% if hostvars[host]['inventory_hostname'] != inventory_hostname %}
-	rdnss {{ hostvars[host]['mesh_ipv6_address']|ipaddr('address')}};
-{% endif %}
+	rdnss {{hostvars[host].batman_mesh_ipv6|ipaddr('address')}};
 {% endfor %}
 }

+ 1 - 6
roles/service-dns/templates/unbound.conf.j2

@@ -9,12 +9,7 @@ server:
 
 local-zone: "services.ffdo.de." static
 {% for host in groups['supernodes'] %}
-local-data: "{{loop.index}}.ntp.services.ffdo.de. A {{hostvars[host].batman_mesh_ipv4|ipaddr('address')}}"
-local-data: "{{loop.index}}.ntp.services.ffdo.de. AAAA {{hostvars[host].batman_mesh_ipv6|ipaddr('address')}}"
-{% endfor %}
-{% for host in groups['supernodes'] %}
-local-data: "ntp.services.ffdo.de. A {{hostvars[host].batman_mesh_ipv4|ipaddr('address')}}"
-local-data: "ntp.services.ffdo.de. AAAA {{hostvars[host].batman_mesh_ipv6|ipaddr('address')}}"
+local-data: "ntp.services.ffdo.de. AAAA {{hostvars[host].mesh_ipv6_address|ipaddr('address')}}"
 {% endfor %}
 local-data: "update.services.ffdo.de. AAAA {{update_server}}"