Updated ens.pm and pns.pm (modified DNS config files for renumbering).

diff --git a/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh
index 00370c15f7b55bcceb3c1cd08346f94dbf9f6ddf..6bd722492632d4b5a7de161f327f606728a484ee 100755 (executable)
--- a/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,12 +62,6 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:ad40/64" \
-#    ipv6.dns "2a02:d400:0000:f2ad:000c:18ff:fe03:adae" \
-#    ipv6.dns-search "pm.useribm.hu" \
-#    ipv6.gateway "2a02:d400:0000:f2ad:000c:18ff:fe03:adfe" \
-#    ipv6.routes "2a02:d400:0000:f268::/64 2a02:d400:0000:f2ad:000c:18ff:fe03:ad01" \
-#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id perimeter \
@@ -79,10 +73,15 @@ nmcli connection add \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
     ipv4.routes "10.228.0.0/16 192.168.173.1" \
-    ipv6.method "disabled" \
+    ipv6.addresses "2001:1aa1:000a:7c0c:000c:18ff:fe03:ad40/64" \
+    ipv6.dns "2001:1aa1:000a:7c0c:000c:18ff:fe03:adae" \
+    ipv6.dns-search "pm.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:7c0c:000c:18ff:fe03:adfe" \
+    ipv6.routes "2001:1aa1:000a:7dae::/64 2001:1aa1:000a:7c0c:000c:18ff:fe03:ad01" \
+    ipv6.method "manual" \
     save yes
 
 nmcli connection show
 
-hostnamectl hostname pns.pm.useribm.hu
+hostnamectl hostname ens.pm.useribm.hu
 hostnamectl

diff --git a/sources/ens.pm/c3d/postinstall/install-data/etc/named.conf b/sources/ens.pm/c3d/postinstall/install-data/etc/named.conf
index aca7ded0a7dac7b9f3a9ae35ae149951bfe0f094..91b83009ce5df4fc030b1c12cbbfba383c48e951 100644 (file)
--- a/sources/ens.pm/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/ens.pm/c3d/postinstall/install-data/etc/named.conf
@@ -125,10 +125,10 @@ key "peep_bo_ns-user_ns" {
 acl source_ns_key_acl          { key "source_ns-external_ns"; };
 acl peep_bo_ns_key_acl         { key "peep_bo_ns-user_ns"; };
 
-masters source_ns_master       { 10.228.109.204 key "source_ns-external_ns"; };
+masters source_ns_master       { 10.228.109.11 key "source_ns-external_ns"; };
 masters peep_bo_ns_master      { 46.107.213.35 key "peep_bo_ns-user_ns"; };
 
-server 10.228.109.204          { keys { "source_ns-external_ns"; }; };
+server 10.228.109.11           { keys { "source_ns-external_ns"; }; };
 server 46.107.213.35           { keys { "peep_bo_ns-user_ns"; }; };
 
 view "external" {

diff --git a/sources/pns.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/pns.pm/c3d/firstboot/scripts/01_setupnetworking.sh
index 3aba29bccff646bb0a293550beab0785238dfe0f..652a53ba0c10e9b48ec1d206a1fb841e86db6deb 100755 (executable)
--- a/sources/pns.pm/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/pns.pm/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -62,12 +62,6 @@ CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':')
 
 nmcli connection delete uuid "$CONNECTION_UUID"
 
-#    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:adae/64" \
-#    ipv6.dns "2a02:d400:0000:f2ad:000c:18ff:fe03:adae" \
-#    ipv6.dns-search "pm.useribm.hu" \
-#    ipv6.gateway "2a02:d400:0000:f2ad:000c:18ff:fe03:adfe" \
-#    ipv6.routes "2a02:d400:0000:f268::/64 2a02:d400:0000:f2ad:000c:18ff:fe03:ad01" \
-#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id perimeter \
@@ -79,7 +73,12 @@ nmcli connection add \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
     ipv4.routes "10.228.0.0/16 192.168.173.1" \
-    ipv6.method "disabled" \
+    ipv6.addresses "2001:1aa1:000a:7c0c:000c:18ff:fe03:adae/64" \
+    ipv6.dns "2001:1aa1:000a:7c0c:000c:18ff:fe03:adae" \
+    ipv6.dns-search "pm.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:7c0c:000c:18ff:fe03:adfe" \
+    ipv6.routes "2001:1aa1:000a:7dae::/64 2001:1aa1:000a:7c0c:000c:18ff:fe03:ad01" \
+    ipv6.method "manual" \
     save yes
 
 nmcli connection show

diff --git a/sources/pns.pm/c3d/postinstall/install-data/etc/named.conf b/sources/pns.pm/c3d/postinstall/install-data/etc/named.conf
index f8a8668d0293bcd9c2c96473ba8f84901e5b179a..880c4f0496e177f31133b3300363664355f894ca 100644 (file)
--- a/sources/pns.pm/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/pns.pm/c3d/postinstall/install-data/etc/named.conf
@@ -120,9 +120,9 @@ key "source_ns-perimeter_ns" {
 
 acl source_ns_key_acl          { key "source_ns-perimeter_ns"; };
 
-masters source_ns_master       { 10.228.109.204 key "source_ns-perimeter_ns"; };
+masters source_ns_master       { 10.228.109.11 key "source_ns-perimeter_ns"; };
 
-server 10.228.109.204          { keys { "source_ns-perimeter_ns"; }; };
+server 10.228.109.11           { keys { "source_ns-perimeter_ns"; }; };
 
 view "perimeter" {
        match-clients           { localnets; localhost; source_ns_key_acl; };
@@ -161,10 +161,10 @@ view "perimeter" {
                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 "sr.user.hu" IN {
                type slave;
@@ -193,10 +193,10 @@ view "perimeter" {
                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