ansible: Fix DNS records on gate

ansible/templates/bind/named.conf.options.j2

 options {
-	directory "/var/cache/bind";
+    directory "/var/cache/bind";
 
-	// If there is a firewall between you and nameservers you want
-	// to talk to, you may need to fix the firewall to allow multiple
-	// ports to talk.  See http://www.kb.cert.org/vuls/id/800113
+    // If there is a firewall between you and nameservers you want
+    // to talk to, you may need to fix the firewall to allow multiple
+    // ports to talk.  See http://www.kb.cert.org/vuls/id/800113
 
-	// If your ISP provided one or more IP addresses for stable
-	// nameservers, you probably want to use them as forwarders.
-	// Uncomment the following block, and insert the addresses replacing
-	// the all-0's placeholder.
+    // If your ISP provided one or more IP addresses for stable
+    // nameservers, you probably want to use them as forwarders.
+    // Uncomment the following block, and insert the addresses replacing
+    // the all-0's placeholder.
 
-	//========================================================================
-	// If BIND logs error messages about the root key being expired,
-	// you will need to update your keys.  See https://www.isc.org/bind-keys
-	//========================================================================
-	dnssec-validation auto;
+    //========================================================================
+    // If BIND logs error messages about the root key being expired,
+    // you will need to update your keys.  See https://www.isc.org/bind-keys
+    //========================================================================
+    dnssec-validation auto;
 
     listen-on { any; };
-	listen-on-v6 { any; };
+    listen-on-v6 { any; };
 
-	forwarders {
+    forwarders {
         83.240.0.215; {# netbox #}
         83.240.0.136; {# netbox #}
-        193.0.14.129; {# root K #}
-        192.36.148.17; {# root I #}
+        208.67.222.222; {# opendns #}
+        208.67.220.220; {# opendns #}
+        1.1.1.1; {# Cloudflare #}
+        1.0.0.1; {# Cloudflare #}
         2001:4cc8:0:4:0:5:0:1; {# netbox #}
         2001:4cc8:0:4:0:6:0:1; {# netbox #}
         2620:119:35::35; {# opendns.com #}
         2620:119:53::53; {# opendns.com #}
-        2001:7fe::53; {# root I #}
-        2001:7fd::1; {# root K #}
+        2606:4700:4700::1111; {# cloudflare #}
+        2606:4700:4700::1001; {# cloudflare #}
 
-	};
+    };
     allow-recursion {
         192.168.0.0/16;
         {{net.ipv6_prefix}}::0/64;
@@ -41,4 +43,4 @@ options {
     hostname "{{inventory_hostname}}";
 };
 
-// vim: ft=jinja
+// vim: ft=jinja expandtab

ansible/templates/dhcpd.conf.j2

@@ -2,7 +2,7 @@
 
 # option definitions common to all supported networks...
 option domain-name "p.vstill.cz";
-option domain-name-servers 192.168.5.1, 192.36.148.17 {# root I #}, 193.0.14.129 {# root K #}, 83.240.0.215 {# netbox #}, 83.240.0.136 {# netbox #};
+option domain-name-servers 192.168.5.1, 208.67.222.222 {# opendns #}, 208.67.220.220 {# opendns #}, 1.1.1.1 {# Cloudflare #}, 1.0.0.1 {# Cloudflare #}, 83.240.0.215 {# netbox #}, 83.240.0.136 {# netbox #};
 
 default-lease-time 600;
 max-lease-time 7200;
@@ -25,3 +25,7 @@ host {{h.name}} {
 
 {% endif %}
 {% endfor %}
+
+{#
+vim: ft=jinja expandtab
+#}

ansible/templates/dhcpd6.conf.j2

 # WARNING: This file is automatically managed by ansible, any changes in it will be discarded on configuration reload
 
 # option definitions common to all supported networks...
-option dhcp6.name-servers {{net.ipv6_prefix}}::1, 2620:119:35::35, 2620:119:53::53, 2001:7fe::53, 2001:7fd::1;
+option dhcp6.name-servers {{net.ipv6_prefix}}::1, 2620:119:35::35 {# opendns #}, 2620:119:53::53 {# opendns #}, 2606:4700:4700::1111 {# cloudflare #}, 2606:4700:4700::1001 {# cloudflare #};
 option dhcp6.domain-search "ipv6.vstill.cz";
 
 default-lease-time 600;
@@ -27,3 +27,7 @@ host {{h.name}} {
 
 {% endif %}
 {% endfor %}
+
+{#
+vim: ft=jinja expandtab
+#}