Updated sns.in (ACE -> Invitech, disabled IPv6).

diff --git a/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 8968288655f4ad6107fde77f433bc6ed1b0660e5..e097f803a08316c42bd80022ba3d6b78b2f7f625 100755 (executable)
--- a/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/sns.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -54,6 +54,11 @@ 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 \
@@ -64,11 +69,7 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
-    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" \
+    ipv6.method "disabled" \
     save yes
 
 nmcli connection show

diff --git a/sources/sns.in/c3d/postinstall/install-data/usr/local/bin/name2ip.py b/sources/sns.in/c3d/postinstall/install-data/usr/local/bin/name2ip.py
index ead3a13aa35dfebe6ce4db502071a6fc23dc6b1f..a71f1fd6885336e4d1bf9b8d67ce527248e69a67 100755 (executable)
--- a/sources/sns.in/c3d/postinstall/install-data/usr/local/bin/name2ip.py
+++ b/sources/sns.in/c3d/postinstall/install-data/usr/local/bin/name2ip.py
@@ -10,13 +10,17 @@ list_of_containers = [('dhcp', 'is'),
                       ('fdc', 'is'),
                       ('fds', 'is'),
                       ('ifg', 'is'),
-                      ('mx', 'pm'),
+                      ('ls', 'is'),
+                      ('mx', 'is'),
                       ('ns', 'is'),
+                      ('ns', 'ib'),
                       ('pki', 'is'),
                       ('pns', 'pm'),
                       ('sns', 'is'),
                       ('vpn', 'is'),
-                      ('ws', 'pm')]
+                      ('wiki', 'is'),
+                      ('ws', 'pm'),
+                      ('xfr', 'pm')]
 
 def get_ip_of_name(name):
     name_value = 0

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 f9449444be7351fe1ef7a688786ecedb48dd6840..2122f16ab47c0510736861b7e56a45e8c49346e4 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
@@ -211,6 +211,12 @@ $TTL       86400
 ; ================================================================
 159.92         IN      PTR     ns2.in.useribm.hu.
 
+; ================================================================
+; gpiros (gp = 7 * 10 + 16 = 86)
+; ================================================================
+2.86           IN      PTR     gpora2.in.useribm.hu.
+1.86           IN      PTR     gpora1.in.useribm.hu.
+
 ; ================================================================
 ; fschnell (fs = 6 * 10 + 19 = 79)
 ; ================================================================

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 f6f44c9d349df4c30c6f7226db69083466dc1551..ac680a015daa40ac083f99e46a2164f4959266f5 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
@@ -155,49 +155,49 @@ 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    2a02:d400:0000:f268:000c:18ff:fe03:6dfe
 store                  IN      A       10.228.109.250
-store                  IN      AAAA    2a02:d400:0000:f268:da9d:67ff:fe63:dc68
+;store                 IN      AAAA    2a02:d400:0000:f268:da9d:67ff:fe63:dc68
 svn                    IN      A       10.228.109.250
 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    2a02:d400:0000:f268: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    2a02:d400:0000:f268: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    2a02:d400:0000:f268: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    2a02:d400:0000:f268:000c:18ff:fe03:6dab
 
 ns1                    IN      A       10.228.109.159  ; ns
-ns1                    IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d9f
+;ns1                   IN      AAAA    2a02:d400:0000:f268: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    2a02:d400:0000:f268: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    2a02:d400:0000:f268: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
+;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
 
 fdc                    IN      A       10.228.109.67   ; fd + c
-fdc                    IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d43
+;fdc                   IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d43
 
 dhcp                   IN      A       10.228.109.59   ; ds (dhcp server)
 
@@ -237,7 +237,13 @@ 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    2a02:d400:0000:f268:000c:18ff:fe03:5c9f
+
+; ================================================================
+; gpiros (gp = 7 * 10 + 16 = 86)
+; ================================================================
+gpora2                 IN      A       10.228.86.2
+gpora1                 IN      A       10.228.86.1
 
 ; ================================================================
 ; fschnell (fs = 6 * 10 + 19 = 79)

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource
index dd5a84cb80d7cea9719981e1e58cce33e68cfcc2..78d88b32d5b44834e09f00eb5a2fe807f2f50470 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/mediacube.hu.zonesource
@@ -1,5 +1,5 @@
 $TTL   86400
-@      IN      SOA     ns1.mediacube.hu.       hostmaster.mx.mediacube.hu.     (
+@      IN      SOA     ns1.mediacube.hu.       hostmaster.mediacube.hu.        (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
@@ -11,10 +11,10 @@ $TTL        86400
                IN      TXT     "v=spf1 +mx -all"
                IN      SPF     "v=spf1 +mx -all"
 
-efg            IN      A       37.220.137.97   ; efg
-mx             IN      A       37.220.137.98   ; mail exchanger
-ns             IN      A       37.220.137.99   ; primary name server
-ns1            IN      A       37.220.137.99   ; primary name server
+efg            IN      A       213.253.216.162 ; efg
+mx             IN      A       213.253.216.163 ; mail exchanger
+ns             IN      A       213.253.216.164 ; primary name server
+ns1            IN      A       213.253.216.164 ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
 ws             IN      A       158.177.224.206 ; web server
 www            IN      A       158.177.224.206 ; web server

diff --git a/sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource b/sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource
index cb62d16c6c3cbd4f7f1f99185ba51c280833c37c..21473834a93b6705a8848aedad616f299a3dc650 100644 (file)
--- a/sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource
+++ b/sources/sns.in/c3d/postinstall/install-data/var/named/useredms.hu.zonesource
@@ -1,5 +1,5 @@
 $TTL   86400
-@      IN      SOA     ns1.useredms.hu.        hostmaster.mx.useredms.hu.      (
+@      IN      SOA     ns1.useredms.hu.        hostmaster.useredms.hu. (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
@@ -11,10 +11,10 @@ $TTL        86400
                IN      TXT     "v=spf1 +mx -all"
                IN      SPF     "v=spf1 +mx -all"
 
-efg            IN      A       37.220.137.97   ; efg
-mx             IN      A       37.220.137.98   ; mail exchanger
-ns             IN      A       37.220.137.99   ; primary name server
-ns1            IN      A       37.220.137.99   ; primary name server
+efg            IN      A       213.253.216.162 ; efg
+mx             IN      A       213.253.216.163 ; mail exchanger
+ns             IN      A       213.253.216.164 ; primary name server
+ns1            IN      A       213.253.216.164 ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
 ws             IN      A       158.177.224.206 ; web server
 www            IN      A       158.177.224.206 ; web server

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 51e8410dc0c475cb490204a35287dd1e941f38ef..70410677fb4ae12d50a8676fd8b1e22bae111265 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
@@ -1,5 +1,5 @@
 $TTL   86400
-@      IN      SOA     ns1.useribm.hu. hostmaster.mx.useribm.hu.       (
+@      IN      SOA     ns1.useribm.hu. hostmaster.useribm.hu.  (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
@@ -22,44 +22,41 @@ $TTL        86400
 ; 1356: ace6     (a * 1000 + c * 100 + e * 10 + 6)
 ; 3128: telekom  (t * 100 + k * 100 + o + m)
 
-; Telekom
-efg-tkom       IN      A       188.6.255.10    ; efg
-
-; ACE Telecom
-efg            IN      A       37.220.137.97   ; efg
-mx             IN      A       37.220.137.98   ; mail exchanger
-ns             IN      A       37.220.137.99   ; primary name server
-ns1            IN      A       37.220.137.99   ; primary name server
+; Invitech
+efg            IN      A       213.253.216.162 ; efg
+mx             IN      A       213.253.216.163 ; mail exchanger
+ns             IN      A       213.253.216.164 ; primary name server
+ns1            IN      A       213.253.216.164 ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
-vpn            IN      A       37.220.137.100  ; OpenVPN server
-git            IN      A       37.220.137.101  ; git
-hg             IN      A       37.220.137.101  ; mercurial
-jtrac          IN      A       37.220.137.101  ; jtrac
-minicrm                IN      A       37.220.137.101  ; minicrm
-redmine                IN      A       37.220.137.101  ; redmine
-store          IN      A       37.220.137.101  ; store E: +, I: -, P: +
+store          IN      A       213.253.216.165 ; store E: +, I: -, P: +
 store          IN      A       10.228.109.250  ; store E: -, I: +, P: -
-store          IN      AAAA    2a02:d400:0000:f268:da9d:67ff:fe63:dc68
-svn            IN      A       37.220.137.101  ; subversion
-wiki           IN      A       37.220.137.101  ; wiki server  E: +, I: -, P: +
+;store         IN      AAAA    2a02:d400:0000:f268:da9d:67ff:fe63:dc68
+vpn            IN      A       213.253.216.166 ; vpn server
+ws             IN      A       213.253.216.167 ; web server
+www            IN      A       213.253.216.167 ; web server
+@              IN      A       213.253.216.167 ; useribm.hu
+
+git            IN      A       213.253.216.167 ; git
+hg             IN      A       213.253.216.167 ; mercurial
+jtrac          IN      A       213.253.216.167 ; jtrac
+minicrm                IN      A       213.253.216.167 ; minicrm
+redmine                IN      A       213.253.216.167 ; redmine
+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
-ws             IN      A       37.220.137.101  ; web server
-www            IN      A       37.220.137.101  ; web server
-@              IN      A       37.220.137.101  ; useribm.hu
-minecraft      IN      A       37.220.137.102  ; akosztolanyi minecraft
+;wiki          IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6def
 ugyvitel       IN      A       158.177.207.248 ; ugyvitel
-unused103      IN      A       37.220.137.103  ; unused
-unused104      IN      A       37.220.137.104  ; unused
-unused105      IN      A       37.220.137.105  ; unused
-unused106      IN      A       37.220.137.106  ; unused
-unused107      IN      A       37.220.137.107  ; unused
-zfdl360e       IN      A       37.220.137.108  ; zfelleg DL360e
-zfelleg                IN      A       37.220.137.109  ; zfelleg server
-zfdl380e       IN      A       37.220.137.109  ; zfelleg DL380e
+unused168      IN      A       213.253.216.168 ; unused
+unused169      IN      A       213.253.216.169 ; unused
+unused170      IN      A       213.253.216.170 ; unused
+unused171      IN      A       213.253.216.171 ; unused
+unused172      IN      A       213.253.216.172 ; unused
+zfdl360e       IN      A       213.253.216.173 ; zfelleg DL360e
+zfelleg                IN      A       213.253.216.174 ; zfelleg server
+zfdl380e       IN      A       213.253.216.174 ; zfelleg DL380e
 
 fds            IN      A       10.228.109.83   ; fd + s E: -, I: +, P: +
-fds            IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d53 ; E: -, I: +, P: -
+;fds           IN      AAAA    2a02:d400:0000:f268:000c:18ff:fe03:6d53 ; E: -, I: +, P: -
 
 $INCLUDE       Kuseribm.hu.+008+24465.key
 $INCLUDE       Kuseribm.hu.+008+56797.key

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 6b0b67ebe34cddb0122900f825044f35921471cf..083956b3cdd5f1a243344945691383c3bceb9165 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
@@ -1,5 +1,5 @@
 $TTL   86400
-@      IN      SOA     ns1.userrendszerhaz.hu. hostmaster.mx.userrendszerhaz.hu.       (
+@      IN      SOA     ns1.userrendszerhaz.hu. hostmaster.userrendszerhaz.hu.  (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
@@ -26,35 +26,34 @@ $TTL        86400
 ; 1356: ace6     (a * 1000 + c * 100 + e * 10 + 6)
 ; 3128: telekom  (t * 100 + k * 100 + o + m)
 
-; Telekom
-efg-tkom       IN      A       188.6.255.10    ; efg
-
-; ACE Telecom
-efg            IN      A       37.220.137.97   ; efg
-mx             IN      A       37.220.137.98   ; mail exchanger
-ns             IN      A       37.220.137.99   ; primary name server
-ns1            IN      A       37.220.137.99   ; primary name server
+; Invitech
+efg            IN      A       213.253.216.162 ; efg
+mx             IN      A       213.253.216.163 ; mail exchanger
+ns             IN      A       213.253.216.164 ; primary name server
+ns1            IN      A       213.253.216.164 ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
-vpn            IN      A       37.220.137.100  ; OpenVPN server
-hg             IN      A       37.220.137.101  ; mercurial
-jtrac          IN      A       37.220.137.101  ; jtrac
-minicrm                IN      A       37.220.137.101  ; minicrm
-redmine                IN      A       37.220.137.101  ; redmine
-svn            IN      A       37.220.137.101  ; subversion
-wiki           IN      A       37.220.137.101  ; wiki server E: +, I: -, P: +
-wiki           IN      A       10.228.109.239  ; wiki server E: -, I: +, P: -
+vpn            IN      A       213.253.216.166 ; vpn server
 ws             IN      A       52.178.40.45    ; web server
 www            IN      A       52.178.40.45    ; web server
 @              IN      A       52.178.40.45    ; userrendszerhaz.hu
-minecraft      IN      A       37.220.137.102  ; akosztolanyi minecraft
-unused103      IN      A       37.220.137.103  ; unused
-unused104      IN      A       37.220.137.104  ; unused
-unused105      IN      A       37.220.137.105  ; unused
-unused106      IN      A       37.220.137.106  ; unused
-unused107      IN      A       37.220.137.107  ; unused
-zfdl360e       IN      A       37.220.137.108  ; zfelleg DL360e
-zfelleg                IN      A       37.220.137.109  ; zfelleg server
-zfdl380e       IN      A       37.220.137.109  ; zfelleg DL380e
+
+git            IN      A       213.253.216.167 ; git
+hg             IN      A       213.253.216.167 ; mercurial
+jtrac          IN      A       213.253.216.167 ; jtrac
+minicrm                IN      A       213.253.216.167 ; minicrm
+redmine                IN      A       213.253.216.167 ; redmine
+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
+unused169      IN      A       213.253.216.169 ; unused
+unused170      IN      A       213.253.216.170 ; unused
+unused171      IN      A       213.253.216.171 ; unused
+unused172      IN      A       213.253.216.172 ; unused
+zfdl360e       IN      A       213.253.216.173 ; zfelleg DL360e
+zfelleg                IN      A       213.253.216.174 ; zfelleg server
+zfdl380e       IN      A       213.253.216.174 ; zfelleg DL380e
 
 ibmstorage     IN      A       52.178.40.45    ; mszabo
 ibmdrsite      IN      A       52.178.40.45    ; mszabo

diff --git a/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh b/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
index fc083ac8c3fdccd3348a11643767109e5630d1ad..13bace607a3e89cec8c7b5bba04d2d498bc21e6d 100755 (executable)
--- a/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
+++ b/sources/sns.in/c3d/postinstall/scripts/20_setupzonefiles.sh
@@ -21,4 +21,4 @@ do
 done
 
 chmod 640 *.zone
-chown named.named *.zone
+chown named:named *.zone

diff --git a/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh b/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
index 280e71e64bfa77bf5824d2137c3a3cf618d53754..efc34dd053fd8668daf512acacde1b6fd127bad7 100755 (executable)
--- a/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
+++ b/sources/sns.in/c3d/postinstall/scripts/21_setupdnssec.sh
@@ -99,4 +99,4 @@ do
 done
 
 chmod 640 *.signed
-chown named.named dsset-* *.signed
+chown named:named dsset-* *.signed