Updated ns{1,2}.in (modified DNS config files for renumbering).

diff --git a/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 3d1eee7c9e6812ae3763c76f273d3624d541f335..6d0f6f54220288cdf9d2146119a1a74a76aaf0c8 100755 (executable)
--- a/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -72,10 +72,10 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    ipv6.addresses "2001:1aa1:000a:0424:000c:18ff:fe03:6d9f/64" \
-    ipv6.dns "2001:1aa1:000a:0424:000c:18ff:fe03:5c9f, 2001:1aa1:000a:0424:000c:18ff:fe03:6d9f" \
+    ipv6.addresses "2001:1aa1:000a:7dae:000c:18ff:fe03:6d9f/64" \
+    ipv6.dns "2001:1aa1:000a:7dae:000c:18ff:fe03:5c9f, 2001:1aa1:000a:7dae:000c:18ff:fe03:6d9f" \
     ipv6.dns-search "in.useribm.hu" \
-    ipv6.gateway "2001:1aa1:000a:0424:000c:18ff:fe03:6dfe" \
+    ipv6.gateway "2001:1aa1:000a:7dae:000c:18ff:fe03:6dfe" \
     ipv6.method "manual" \
     save yes
 

diff --git a/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf b/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
index 0bc2d34d50647195d3611f7f924583819fe9e7dc..0eda23839d19d87b47d55d0e52d76d8e4ed76627 100644 (file)
--- a/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/ns1.in/c3d/postinstall/install-data/etc/named.conf
@@ -118,13 +118,13 @@ key "source_ns-internal_ns1" {
         secret "tFwMOb5GqnRAGnrXAJiY4JcCGfHi7V4Ut4POvNj2vnM=";
 };
 
-acl internal_networks  { 2001:1aa1:000a:0424::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl internal_networks  { 2001:1aa1:000a:7dae::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
 acl vpn_client_network { 172.24.232.0/24; };
 acl source_ns_key_acl  { key "source_ns-internal_ns1"; };
 
-masters source_ns_master       { 10.228.109.204 key "source_ns-internal_ns1"; };
+masters source_ns_master       { 10.228.109.11 key "source_ns-internal_ns1"; };
 
-server 10.228.109.204          { keys { "source_ns-internal_ns1"; }; };
+server 10.228.109.11           { keys { "source_ns-internal_ns1"; }; };
 
 view "internal" {
        match-clients           { internal_networks; vpn_client_network; localhost; source_ns_key_acl; };
@@ -161,31 +161,31 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/228.10.in-addr.arpa.zone";
        };
-       zone "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
+       zone "e.a.d.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
-       };
-       zone "mlx1.useribm.hu" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/mlx1.useribm.hu.zone";
-       };
-       zone "131.16.172.in-addr.arpa" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/131.16.172.in-addr.arpa.zone";
-       };
-       zone "mlx2.useribm.hu" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/mlx2.useribm.hu.zone";
-       };
-       zone "132.16.172.in-addr.arpa" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/132.16.172.in-addr.arpa.zone";
+               file "slaves/e.a.d.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
+       #zone "mlx1.useribm.hu" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/mlx1.useribm.hu.zone";
+       #};
+       #zone "131.16.172.in-addr.arpa" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/131.16.172.in-addr.arpa.zone";
+       #};
+       #zone "mlx2.useribm.hu" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/mlx2.useribm.hu.zone";
+       #};
+       #zone "132.16.172.in-addr.arpa" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/132.16.172.in-addr.arpa.zone";
+       #};
        zone "sr.user.hu" IN {
                type slave;
                masters { source_ns_master; };
@@ -213,10 +213,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/173.168.192.in-addr.arpa.zone";
        };
-       zone "d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
+       zone "c.0.c.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
+               file "slaves/c.0.c.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
 
        # external zones

diff --git a/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 80ffb5bbe7c3dfa5ef89f49850d3b655381de7bf..543d868f79b2214db7f4f9af8603ac550375a486 100755 (executable)
--- a/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -72,10 +72,10 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    ipv6.addresses "2001:1aa1:000a:0424:000c:18ff:fe03:5c9f/64" \
-    ipv6.dns "2001:1aa1:000a:0424:000c:18ff:fe03:6d9f, 2001:1aa1:000a:0424:000c:18ff:fe03:5c9f" \
+    ipv6.addresses "2001:1aa1:000a:7dae:000c:18ff:fe03:5c9f/64" \
+    ipv6.dns "2001:1aa1:000a:7dae:000c:18ff:fe03:6d9f, 2001:1aa1:000a:7dae:000c:18ff:fe03:5c9f" \
     ipv6.dns-search "in.useribm.hu" \
-    ipv6.gateway "2001:1aa1:000a:0424:000c:18ff:fe03:6dfe" \
+    ipv6.gateway "2001:1aa1:000a:7dae:000c:18ff:fe03:6dfe" \
     ipv6.method "manual" \
     save yes
 

diff --git a/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf b/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
index 800c35046ca99065de60311b7a48d4a3e852eae7..54639a930567eb3bedd0989037aebf43fa4d7f02 100644 (file)
--- a/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/ns2.in/c3d/postinstall/install-data/etc/named.conf
@@ -118,13 +118,13 @@ key "source_ns-internal_ns2" {
         secret "8GgA5QFCrn3rx0skQOoZH5kdqPOSyx87IJ7Cg1ocvyA=";
 };
 
-acl internal_networks  { 2001:1aa1:000a:0424::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl internal_networks  { 2001:1aa1:000a:7dae::/64; 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
 acl vpn_client_network { 172.24.232.0/24; };
 acl source_ns_key_acl  { key "source_ns-internal_ns2"; };
 
-masters source_ns_master       { 10.228.109.204 key "source_ns-internal_ns2"; };
+masters source_ns_master       { 10.228.109.11 key "source_ns-internal_ns2"; };
 
-server 10.228.109.204          { keys { "source_ns-internal_ns2"; }; };
+server 10.228.109.11           { keys { "source_ns-internal_ns2"; }; };
 
 view "internal" {
        match-clients           { internal_networks; vpn_client_network; localhost; source_ns_key_acl; };
@@ -161,31 +161,31 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/228.10.in-addr.arpa.zone";
        };
-       zone "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
+       zone "e.a.d.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
-       };
-       zone "mlx1.useribm.hu" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/mlx1.useribm.hu.zone";
-       };
-       zone "131.16.172.in-addr.arpa" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/131.16.172.in-addr.arpa.zone";
-       };
-       zone "mlx2.useribm.hu" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/mlx2.useribm.hu.zone";
-       };
-       zone "132.16.172.in-addr.arpa" IN {
-               type slave;
-               masters { source_ns_master; };
-               file "slaves/132.16.172.in-addr.arpa.zone";
+               file "slaves/e.a.d.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
+       #zone "mlx1.useribm.hu" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/mlx1.useribm.hu.zone";
+       #};
+       #zone "131.16.172.in-addr.arpa" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/131.16.172.in-addr.arpa.zone";
+       #};
+       #zone "mlx2.useribm.hu" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/mlx2.useribm.hu.zone";
+       #};
+       #zone "132.16.172.in-addr.arpa" IN {
+       #       type slave;
+       #       masters { source_ns_master; };
+       #       file "slaves/132.16.172.in-addr.arpa.zone";
+       #};
        zone "sr.user.hu" IN {
                type slave;
                masters { source_ns_master; };
@@ -213,10 +213,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/173.168.192.in-addr.arpa.zone";
        };
-       zone "d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
+       zone "c.0.c.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
+               file "slaves/c.0.c.7.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
 
        # external zones