Updated sns (ace ipv6 -> invitech ipv6).

diff --git a/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 86b657028fd5092c8bf1e6a4b3143716f14d4390..c23118866b7e6f902ed5d01232bd8ae1cc16c041 100755 (executable)
--- a/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/sns.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:6dcc/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:6dcc/64" \
+    ipv6.dns "2001:1aa1:000a:0068:000c:18ff:fe03:6d9f, 2001:1aa1:000a:0068:000c:18ff:fe03:5c9f" \
+    ipv6.dns-search "in.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:0068:000c:18ff:fe03:6dfe" \
+    ipv6.method "manual" \
     save yes
 
 nmcli connection show

diff --git a/sources/sns.in/c3d/postinstall/install-data/etc/named.conf b/sources/sns.in/c3d/postinstall/install-data/etc/named.conf
index 565985d04852a3d114cc4fc4b56b296d0d7a31ac..c1913d9b8d7d77dd0b03b7d0b98d08880004fcc5 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/etc/named.conf
+++ b/sources/sns.in/c3d/postinstall/install-data/etc/named.conf
@@ -231,9 +231,9 @@ view "perimeter" {
                type master;
                file "173.168.192.in-addr.arpa.perimeter.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 master;
-               file "d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.perimeter.zone";
+               file "d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.perimeter.zone";
        };
 
        # internal zones (used in the DMZ)
@@ -253,9 +253,9 @@ view "perimeter" {
                type master;
                file "228.10.in-addr.arpa.perimeter.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 master;
-               file "8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.perimeter.zone";
+               file "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.perimeter.zone";
        };
        zone "sr.user.hu" IN {
                type master;
@@ -307,9 +307,9 @@ view "internal" {
                type master;
                file "173.168.192.in-addr.arpa.internal.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 master;
-               file "d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.internal.zone";
+               file "d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.internal.zone";
        };
 
        # internal zones
@@ -329,9 +329,9 @@ view "internal" {
                type master;
                file "228.10.in-addr.arpa.internal.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 master;
-               file "8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.internal.zone";
+               file "4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.internal.zone";
        };
        zone "mlx1.useribm.hu" IN {
                type master;

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource
index e43222c32e9e9770b41b817d7f5269e0b99c6383..6194e3b490eec2ba1882a4d48ff3550637679ce1 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/228.10.in-addr.arpa.zonesource
@@ -16,10 +16,8 @@ $TTL 86400
 ; ================================================================
 ; wifi routers (wr = 23 * 10 + 18 = 248)
 ; ================================================================
-206.248                IN      PTR     archer-c5-tf.in.useribm.hu.
-196.248                IN      PTR     archer-c6-sf.in.useribm.hu.
-193.248                IN      PTR     archer-c5-sc.in.useribm.hu.
-66.248         IN      PTR     archer-c6-ff.in.useribm.hu.
+77.248         IN      PTR     archer-c6-tec.in.useribm.hu.
+8.248          IN      PTR     archer-c6-fin.in.useribm.hu.
 
 ; ================================================================
 ; UPSes (up = 21 * 10 + 16 = 226)
@@ -325,6 +323,11 @@ $GENERATE  100-254 $.43    IN      PTR     dhcp$.in.useribm.hu.
 2.34           IN      PTR     cds822hmc2.in.useribm.hu.
 1.34           IN      PTR     cds822hmc1.in.useribm.hu.
 
+; ================================================================
+; avon (av = 1 * 10 + 22 = 32)
+; ================================================================
+197.32         IN      PTR     avnetlock.in.useribm.hu.
+
 ; ================================================================
 ; akosztolanyi (ak = 1 * 10 + 11 = 21)
 ; ================================================================

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zonesource
similarity index 100%
rename from sources/sns.in/c3d/postinstall/install-data/var/named/8.6.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/4.2.4.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zonesource

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zonesource
similarity index 100%
rename from sources/sns.in/c3d/postinstall/install-data/var/named/d.a.2.f.0.0.0.0.0.0.4.d.2.0.a.2.ip6.arpa.zonesource
rename to sources/sns.in/c3d/postinstall/install-data/var/named/d.a.0.0.a.0.0.0.1.a.a.1.1.0.0.2.ip6.arpa.zonesource

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource
index dec414849a3896de79a653bed570b4433a8293be..8ffefddf75980f7d52be9f982b0c5f708d21244f 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/in.useribm.hu.zonesource
@@ -16,10 +16,8 @@ $TTL 86400
 ; ================================================================
 ; wifi routers (wr = 23 * 10 + 18 = 248)
 ; ================================================================
-archer-c5-tf           IN      A       10.228.248.206  ; tf (third floor)
-archer-c6-sf           IN      A       10.228.248.196  ; sf (second floor)
-archer-c5-sc           IN      A       10.228.248.193  ; sc (second floor conference room)
-archer-c6-ff           IN      A       10.228.248.66   ; ff (first floor)
+archer-c6-tec          IN      A       10.228.248.77   ; techies room
+archer-c6-fin          IN      A       10.228.248.8    ; finance room
 
 ; ================================================================
 ; UPSes (up = 21 * 10 + 16 = 226)
@@ -165,52 +163,50 @@ ittestwin2012             IN      A       10.228.110.12
 ; infrastructure servers (is = 9 * 10 + 19 = 109)
 ; ================================================================
 ifg                    IN      A       10.228.109.254
-;ifg                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6dfe
+ifg                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6dfe
+
 store                  IN      A       10.228.109.250
-;store                 IN      AAAA    2a02:d400:0000:f268:da9d:67ff:fe63:dc68
-svn                    IN      A       10.228.109.250
+store                  IN      AAAA    2001:1aa1:000a:0424:da9d:67ff:fe63:dc68
+
 tsm                    IN      A       10.228.109.249
 
 wiki                   IN      A       10.228.109.239  ; ws (wiki server)
-;wiki                  IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6def
+wiki                   IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6def
 
 vpn                    IN      A       10.228.109.236  ; vp
 
 sns                    IN      A       10.228.109.204  ; sn
-;sns                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6dcc
+sns                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6dcc
 
 isc                    IN      A       10.228.109.193  ; sc (ibm spectrum connect)
 
 pns                    IN      A       10.228.109.174  ; pn
-;pns                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6dae
+pns                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6dae
 
 pki                    IN      A       10.228.109.171  ; pk
-;pki                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6dab
+pki                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6dab
 
 db2                    IN      A       10.228.109.166  ; db2 server
-;db2                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6da6
+db2                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6da6
 
 ns1                    IN      A       10.228.109.159  ; ns
-;ns1                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d9f
+ns1                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6d9f
 
 mx                     IN      A       10.228.109.154  ; mx
-;mx                    IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d9a
+mx                     IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6d9a
 
 ls                     IN      A       10.228.109.139  ; ls
-;ls                    IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d8b
+ls                     IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6d8b
 
 minicrm                        IN      A       10.228.109.133  ; mc
 
 iscbe                  IN      A       10.228.109.109  ; is
 
-ins                    IN      A       10.228.109.104  ; in
-;ins                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d68
-
 ;fds                   IN      A       10.228.109.83   ; fd + s
-;fds                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d53
+;fds                   IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6d53
 
 fdc                    IN      A       10.228.109.67   ; fd + c
-;fdc                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d43
+fdc                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:6d43
 
 dhcp                   IN      A       10.228.109.59   ; ds (dhcp server)
 
@@ -250,7 +246,7 @@ ntp1                        IN      A       10.228.93.1
 ; infrastructure backup servers (ib = 9 * 10 + 2 = 92)
 ; ================================================================
 ns2                    IN      A       10.228.92.159   ; ns
-;ns2                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:5c9f
+ns2                    IN      AAAA    2001:1aa1:000a:0424:000c:18ff:fe03:5c9f
 
 ; ================================================================
 ; gpiros (gp = 7 * 10 + 16 = 86)
@@ -354,6 +350,11 @@ cds822                     IN      A       10.228.34.22
 cds822hmc2             IN      A       10.228.34.2
 cds822hmc1             IN      A       10.228.34.1
 
+; ================================================================
+; avon (av = 1 * 10 + 22 = 32)
+; ================================================================
+avnetlock              IN      A       10.228.32.197
+
 ; ================================================================
 ; akosztolanyi (ak = 1 * 10 + 11 = 21)
 ; ================================================================

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource
index 247a6255df99c778f84a794b6258ea9745ebd83a..1e9cd457cdfc8c3734af685f6292e56f0e613202 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/useribm.hu.zonesource
@@ -46,7 +46,7 @@ wiki          IN      A       213.253.216.167 ; wiki server  E: +, I: -, P: +
 wiki           IN      A       10.228.109.239  ; wiki server  E: -, I: +, P: -
 ;wiki          IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6def
 ugyvitel       IN      A       158.177.207.248 ; ugyvitel
-unused168      IN      A       213.253.216.168 ; unused
+netlock                IN      A       213.253.216.168 ; avon netlock
 unused169      IN      A       213.253.216.169 ; unused
 unused170      IN      A       213.253.216.170 ; unused
 unused171      IN      A       213.253.216.171 ; unused

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource
index 71f93471c67f86d97abac9d5ced851d57e720ec1..cca2948a07e9576f0d9d07fd60ac4cddd39716ec 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/userrendszerhaz.hu.zonesource
@@ -46,7 +46,7 @@ svn           IN      A       213.253.216.167 ; subversion
 wiki           IN      A       213.253.216.167 ; wiki server  E: +, I: -, P: +
 wiki           IN      A       10.228.109.239  ; wiki server  E: -, I: +, P: -
 ;wiki          IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6def
-unused168      IN      A       213.253.216.168 ; unused
+netlock                IN      A       213.253.216.168 ; avon netlock
 unused169      IN      A       213.253.216.169 ; unused
 unused170      IN      A       213.253.216.170 ; unused
 unused171      IN      A       213.253.216.171 ; unused