Updated ns{1,2}.in (ace ipv6 -> invitech ipv6).

diff --git a/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 99d32cc7cb40a23b813d6071407afc473d0c84a0..3d1eee7c9e6812ae3763c76f273d3624d541f335 100755 (executable)
--- a/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ns1.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,11 +62,6 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:6d9f/64" \
-#    ipv6.dns "2a02:d400:0000:f268:000c:18ff:fe03:5c9f, 2a02:d400:0000:f268:000c:18ff:fe03:6d9f" \
-#    ipv6.dns-search "in.useribm.hu" \
-#    ipv6.gateway "2a02:d400:0000:f268:000c:18ff:fe03:6dfe" \
-#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id internal \
@@ -77,7 +72,11 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    ipv6.method "disabled" \
+    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.dns-search "in.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:0424:000c:18ff:fe03:6dfe" \
+    ipv6.method "manual" \
     save yes
 
 nmcli connection show

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 3324564d6300fbf99b7bf367757bf593468aac98..0bc2d34d50647195d3611f7f924583819fe9e7dc 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,7 +118,7 @@ key "source_ns-internal_ns1" {
         secret "tFwMOb5GqnRAGnrXAJiY4JcCGfHi7V4Ut4POvNj2vnM=";
 };
 
-acl internal_networks  { 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl internal_networks  { 2001:1aa1:000a:0424::/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"; };
 
@@ -161,10 +161,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/228.10.in-addr.arpa.zone";
        };
-       zone "8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa" IN {
+       zone "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zone";
+               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;
@@ -213,10 +213,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/173.168.192.in-addr.arpa.zone";
        };
-       zone "d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa" IN {
+       zone "d.a.0.0.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.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zone";
+               file "slaves/d.a.0.0.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 322da4a36a18a4dc76cba7f8d17814d8e8b53165..80ffb5bbe7c3dfa5ef89f49850d3b655381de7bf 100755 (executable)
--- a/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ns2.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,11 +62,6 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:5c9f/64" \
-#    ipv6.dns "2a02:d400:0000:f268:000c:18ff:fe03:6d9f, 2a02:d400:0000:f268:000c:18ff:fe03:5c9f" \
-#    ipv6.dns-search "in.useribm.hu" \
-#    ipv6.gateway "2a02:d400:0000:f268:000c:18ff:fe03:6dfe" \
-#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id internal \
@@ -77,7 +72,11 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    ipv6.method "disabled" \
+    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.dns-search "in.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:0424:000c:18ff:fe03:6dfe" \
+    ipv6.method "manual" \
     save yes
 
 nmcli connection show

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 ecdd6650f01495abefe70de8d0965ef07f256719..800c35046ca99065de60311b7a48d4a3e852eae7 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,7 +118,7 @@ key "source_ns-internal_ns2" {
         secret "8GgA5QFCrn3rx0skQOoZH5kdqPOSyx87IJ7Cg1ocvyA=";
 };
 
-acl internal_networks  { 10.228.0.0/16; 192.168.42.0/24; 192.168.43.0/24; };
+acl internal_networks  { 2001:1aa1:000a:0424::/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"; };
 
@@ -161,10 +161,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/228.10.in-addr.arpa.zone";
        };
-       zone "8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa" IN {
+       zone "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa" IN {
                type slave;
                masters { source_ns_master; };
-               file "slaves/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zone";
+               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;
@@ -213,10 +213,10 @@ view "internal" {
                masters { source_ns_master; };
                file "slaves/173.168.192.in-addr.arpa.zone";
        };
-       zone "d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa" IN {
+       zone "d.a.0.0.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.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zone";
+               file "slaves/d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zone";
        };
 
        # external zones