From 80f1fb7ba8fbe17f5cd6eb1f67bd4f52110e566d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Tue, 25 Jul 2023 12:19:57 +0200 Subject: [PATCH] Updated ens.pm and pns.pm (modified DNS config files for renumbering). --- .../c3d/firstboot/scripts/01_setupnetworking.sh | 15 +++++++-------- .../c3d/postinstall/install-data/etc/named.conf | 4 ++-- .../c3d/firstboot/scripts/01_setupnetworking.sh | 13 ++++++------- .../c3d/postinstall/install-data/etc/named.conf | 12 ++++++------ 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ens.pm/c3d/firstboot/scripts/01_setupnetworking.sh index 00370c1..6bd7224 100755 --- 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 aca7ded..91b8300 100644 --- 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 3aba29b..652a53b 100755 --- 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 f8a8668..880c4f0 100644 --- 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 -- 2.54.0