https://git.useribm.hu / user-lxc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c84ec87)
Updated ens.pm, pns.pm and pns.usr (all external DNS zones are now signed).
authorZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Thu, 11 Mar 2021 13:13:04 +0000 (14:13 +0100)
committerZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Thu, 11 Mar 2021 13:13:04 +0000 (14:13 +0100)
sources/ens.pm/postinstall/install/etc/named.conf patch | blob | history
sources/pns.pm/postinstall/install/etc/named.conf patch | blob | history
sources/pns.usr/postinstall/20_setupdnssec.sh patch | blob | history
sources/pns.usr/postinstall/install/etc/named.conf patch | blob | history
sources/pns.usr/postinstall/install/var/named/mediacube.hu.zone patch | blob | history
sources/pns.usr/postinstall/install/var/named/useredms.hu.zone patch | blob | history
sources/pns.usr/postinstall/install/var/named/useribm.hu.zone patch | blob | history
sources/pns.usr/postinstall/install/var/named/userrendszerhaz.hu.zone patch | blob | history

diff --git a/sources/ens.pm/postinstall/install/etc/named.conf b/sources/ens.pm/postinstall/install/etc/named.conf
index 1091c4f1ca7ffaad448c4276af83bbb12cef89f6..e16912bc0f36da595a71df17e927f3cbe6de15f5 100644 (file)
--- a/sources/ens.pm/postinstall/install/etc/named.conf
+++ b/sources/ens.pm/postinstall/install/etc/named.conf
@@ -162,7 +162,7 @@ view "external" {
        zone "useribm.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/useribm.hu.zone";
+               file "slaves/useribm.hu.zone.signed";
 
                allow-transfer          { peep_bo_ns_key_acl; };
                allow-notify            { primary_ns_key_acl; };
@@ -172,7 +172,7 @@ view "external" {
        zone "userrendszerhaz.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/userrendszerhaz.hu.zone";
+               file "slaves/userrendszerhaz.hu.zone.signed";
 
                allow-transfer          { peep_bo_ns_key_acl; };
                allow-notify            { primary_ns_key_acl; };
@@ -184,7 +184,7 @@ view "external" {
        zone "kolafirearms.com" IN {
                type slave;
                masters { peep_bo_ns_master; };
-               file "slaves/kolafirearms.com.zone";
+               file "slaves/kolafirearms.com.zone.signed";
 
                allow-notify            { peep_bo_ns_key_acl; };
        };
diff --git a/sources/pns.pm/postinstall/install/etc/named.conf b/sources/pns.pm/postinstall/install/etc/named.conf
index 52c7e615138dab6f84a68ed3bbd9fe2ab189d4cf..1bd795e20682eb1f607fd71f80c09d7bbda63bb3 100644 (file)
--- a/sources/pns.pm/postinstall/install/etc/named.conf
+++ b/sources/pns.pm/postinstall/install/etc/named.conf
@@ -190,11 +190,11 @@ view "perimeter" {
        zone "useribm.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/useribm.hu.zone";
+               file "slaves/useribm.hu.zone.signed";
        };
        zone "userrendszerhaz.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/userrendszerhaz.hu.zone";
+               file "slaves/userrendszerhaz.hu.zone.signed";
        };
 };
diff --git a/sources/pns.usr/postinstall/20_setupdnssec.sh b/sources/pns.usr/postinstall/20_setupdnssec.sh
index bb6f1e3b027570387b7ac0872c77d7d07d826bcd..42f33b6fecb86ba56a511651d5989de3b5f012fd 100755 (executable)
--- a/sources/pns.usr/postinstall/20_setupdnssec.sh
+++ b/sources/pns.usr/postinstall/20_setupdnssec.sh
@@ -90,7 +90,7 @@ fi
 cd /var/named
 dnssec-signzone -e +15552000 -N unixtime -o mediacube.hu mediacube.hu.zone
 dnssec-signzone -e +15552000 -N unixtime -o useredms.hu useredms.hu.zone
-#dnssec-signzone -e +15552000 -N unixtime -o useribm.hu useribm.hu.zone
-#dnssec-signzone -e +15552000 -N unixtime -o userrendszerhaz.hu userrendszerhaz.hu.zone
+dnssec-signzone -e +15552000 -N unixtime -o useribm.hu useribm.hu.zone
+dnssec-signzone -e +15552000 -N unixtime -o userrendszerhaz.hu userrendszerhaz.hu.zone
 #dnssec-signzone -e +15552000 -N unixtime -o usr.user.hu usr.user.hu.zone
 #dnssec-signzone -e +15552000 -N unixtime -o pm.user.hu pm.user.hu.zone
diff --git a/sources/pns.usr/postinstall/install/etc/named.conf b/sources/pns.usr/postinstall/install/etc/named.conf
index 1870c5ba40ec30c7ead166dc77efdf9a5d3b51a0..3765d25a42eda285a0d171e55a3f0e7e1ba437af 100644 (file)
--- a/sources/pns.usr/postinstall/install/etc/named.conf
+++ b/sources/pns.usr/postinstall/install/etc/named.conf
@@ -160,11 +160,11 @@ view "external" {
        };
        zone "useribm.hu" IN {
                type master;
-               file "useribm.hu.zone";
+               file "useribm.hu.zone.signed";
        };
        zone "userrendszerhaz.hu" IN {
                type master;
-               file "userrendszerhaz.hu.zone";
+               file "userrendszerhaz.hu.zone.signed";
        };
 };
 
@@ -252,11 +252,11 @@ view "internal" {
        };
        zone "useribm.hu" IN {
                type master;
-               file "useribm.hu.zone";
+               file "useribm.hu.zone.signed";
        };
        zone "userrendszerhaz.hu" IN {
                type master;
-               file "userrendszerhaz.hu.zone";
+               file "userrendszerhaz.hu.zone.signed";
        };
 };
 
@@ -328,10 +328,10 @@ view "perimeter" {
        };
        zone "useribm.hu" IN {
                type master;
-               file "useribm.hu.zone";
+               file "useribm.hu.zone.signed";
        };
        zone "userrendszerhaz.hu" IN {
                type master;
-               file "userrendszerhaz.hu.zone";
+               file "userrendszerhaz.hu.zone.signed";
        };
 };
diff --git a/sources/pns.usr/postinstall/install/var/named/mediacube.hu.zone b/sources/pns.usr/postinstall/install/var/named/mediacube.hu.zone
index b1f4848e4204d07333a483337509e96a55d52fdc..dd5a84cb80d7cea9719981e1e58cce33e68cfcc2 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/mediacube.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/mediacube.hu.zone
@@ -1,5 +1,4 @@
-;$TTL  86400
-$TTL   3600
+$TTL   86400
 @      IN      SOA     ns1.mediacube.hu.       hostmaster.mx.mediacube.hu.     (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
diff --git a/sources/pns.usr/postinstall/install/var/named/useredms.hu.zone b/sources/pns.usr/postinstall/install/var/named/useredms.hu.zone
index 72242d6e4c68f0bbbfad3cdf415fa628a4861423..cb62d16c6c3cbd4f7f1f99185ba51c280833c37c 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/useredms.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/useredms.hu.zone
@@ -1,5 +1,4 @@
-;$TTL  86400
-$TTL   3600
+$TTL   86400
 @      IN      SOA     ns1.useredms.hu.        hostmaster.mx.useredms.hu.      (
                                        1               ; Serial
                                        86400           ; Refresh (1 day)
diff --git a/sources/pns.usr/postinstall/install/var/named/useribm.hu.zone b/sources/pns.usr/postinstall/install/var/named/useribm.hu.zone
index 9d1919244ba89f7e6f4106189fb1ed186558e037..666b487bc24d0e5cd8c1941b7e108e543739a554 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/useribm.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/useribm.hu.zone
@@ -1,7 +1,6 @@
-;$TTL  86400
-$TTL   3600
+$TTL   86400
 @      IN      SOA     ns1.useribm.hu. hostmaster.mx.useribm.hu.       (
-                                       2021022501      ; Serial
+                                       1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -13,12 +12,12 @@ $TTL        3600
                IN      SPF     "v=spf1 +mx -all"
 
 ; Telekom
-efg            IN      A       194.149.40.146  ; efg
+efg-tkom       IN      A       194.149.40.146  ; efg
 mx             IN      A       194.149.40.147  ; mail exchanger
-ns-telekom     IN      A       194.149.40.148  ; primary name server
-ns1-telekom    IN      A       194.149.40.148  ; primary name server
+ns-tkom                IN      A       194.149.40.148  ; primary name server
+ns1-tkom       IN      A       194.149.40.148  ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
-vpn            IN      A       194.149.40.149  ; OpenVPN server
+vpn-tkom       IN      A       194.149.40.149  ; OpenVPN server
 hg             IN      A       194.149.40.150  ; mercurial
 jtrac          IN      A       194.149.40.150  ; jtrac
 minicrm                IN      A       194.149.40.150  ; minicrm
@@ -34,16 +33,16 @@ unused154   IN      A       194.149.40.154  ; unused
 unused155      IN      A       194.149.40.155  ; unused
 unused156      IN      A       194.149.40.156  ; unused
 zfdl360e       IN      A       194.149.40.157  ; zfelleg DL360e
-fschnell       IN      A       194.149.40.158  ; fschnell/zfelleg server
-zfelleg                IN      A       194.149.40.158  ; fschnell/zfelleg server
-zfdl380e       IN      A       194.149.40.158  ; zfelleg DL380e
+fschnell-tkom  IN      A       194.149.40.158  ; fschnell/zfelleg server
+zfelleg-tkom   IN      A       194.149.40.158  ; fschnell/zfelleg server
+zfdl380e-tkom  IN      A       194.149.40.158  ; zfelleg DL380e
 
 ; ACE Telecom
-efg-ace                IN      A       37.220.137.97   ; efg
+efg            IN      A       37.220.137.97   ; efg
 mx-ace         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
-vpn-ace                IN      A       37.220.137.100  ; OpenVPN server
+vpn            IN      A       37.220.137.100  ; OpenVPN server
 hg-ace         IN      A       37.220.137.101  ; mercurial
 jtrac-ace      IN      A       37.220.137.101  ; jtrac
 minicrm-ace    IN      A       37.220.137.101  ; minicrm
@@ -58,5 +57,8 @@ unused105-ace IN      A       37.220.137.105  ; unused
 unused106-ace  IN      A       37.220.137.106  ; unused
 unused107-ace  IN      A       37.220.137.107  ; unused
 zfdl360e-ace   IN      A       37.220.137.108  ; zfelleg DL360e
-zfelleg-ace    IN      A       37.220.137.109  ; zfelleg server
-zfdl380e-ace   IN      A       37.220.137.109  ; zfelleg DL380e
+zfelleg                IN      A       37.220.137.109  ; zfelleg server
+zfdl380e       IN      A       37.220.137.109  ; zfelleg DL380e
+
+$INCLUDE       Kuseribm.hu.+008+24465.key
+$INCLUDE       Kuseribm.hu.+008+56797.key
diff --git a/sources/pns.usr/postinstall/install/var/named/userrendszerhaz.hu.zone b/sources/pns.usr/postinstall/install/var/named/userrendszerhaz.hu.zone
index 48af16b6d87728feb150b5eb1ac2fcd26cae91af..cdcc9114970dfef6b3906777ad7372478ccc008c 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/userrendszerhaz.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/userrendszerhaz.hu.zone
@@ -1,7 +1,6 @@
-;$TTL  86400
-$TTL   3600
+$TTL   86400
 @      IN      SOA     ns1.userrendszerhaz.hu. hostmaster.mx.userrendszerhaz.hu.       (
-                                       2021022501      ; Serial
+                                       1               ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -17,12 +16,12 @@ $TTL        3600
                IN      TXT     "v=spf1 include:_spf.google.com ~all"
 
 ; Telekom
-efg            IN      A       194.149.40.146  ; efg
+efg-tkom       IN      A       194.149.40.146  ; efg
 mx             IN      A       194.149.40.147  ; mail exchanger
-ns-telekom     IN      A       194.149.40.148  ; primary name server
-ns1-telekom    IN      A       194.149.40.148  ; primary name server
+ns-tkom                IN      A       194.149.40.148  ; primary name server
+ns1-tkom       IN      A       194.149.40.148  ; primary name server
 ns2            IN      A       46.107.213.35   ; secondary name server
-vpn            IN      A       194.149.40.149  ; OpenVPN server
+vpn-tkom       IN      A       194.149.40.149  ; OpenVPN server
 hg             IN      A       194.149.40.150  ; mercurial
 jtrac          IN      A       194.149.40.150  ; jtrac
 minicrm                IN      A       194.149.40.150  ; minicrm
@@ -38,16 +37,16 @@ unused154   IN      A       194.149.40.154  ; unused
 unused155      IN      A       194.149.40.155  ; unused
 unused156      IN      A       194.149.40.156  ; unused
 zfdl360e       IN      A       194.149.40.157  ; zfelleg DL360e
-fschnell       IN      A       194.149.40.158  ; fschnell/zfelleg server
-zfelleg                IN      A       194.149.40.158  ; fschnell/zfelleg server
-zfdl380e       IN      A       194.149.40.158  ; zfelleg DL380e
+fschnell-tkom  IN      A       194.149.40.158  ; fschnell/zfelleg server
+zfelleg-tkom   IN      A       194.149.40.158  ; fschnell/zfelleg server
+zfdl380e-tkom  IN      A       194.149.40.158  ; zfelleg DL380e
 
 ; ACE Telecom
-efg-ace                IN      A       37.220.137.97   ; efg
+efg            IN      A       37.220.137.97   ; efg
 mx-ace         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
-vpn-ace                IN      A       37.220.137.100  ; OpenVPN server
+vpn            IN      A       37.220.137.100  ; OpenVPN server
 hg-ace         IN      A       37.220.137.101  ; mercurial
 jtrac-ace      IN      A       37.220.137.101  ; jtrac
 minicrm-ace    IN      A       37.220.137.101  ; minicrm
@@ -62,8 +61,8 @@ unused105-ace IN      A       37.220.137.105  ; unused
 unused106-ace  IN      A       37.220.137.106  ; unused
 unused107-ace  IN      A       37.220.137.107  ; unused
 zfdl360e-ace   IN      A       37.220.137.108  ; zfelleg DL360e
-zfelleg-ace    IN      A       37.220.137.109  ; zfelleg server
-zfdl380e-ace   IN      A       37.220.137.109  ; zfelleg DL380e
+zfelleg                IN      A       37.220.137.109  ; zfelleg server
+zfdl380e       IN      A       37.220.137.109  ; zfelleg DL380e
 
 ibmstorage     IN      A       52.178.40.45    ; mszabo
 ibmdrsite      IN      A       52.178.40.45    ; mszabo
@@ -75,3 +74,6 @@ mail          IN      CNAME   ghs.google.com.
 sites          IN      CNAME   ghs.google.com.
 
 googleffffffff963b8d47         IN      CNAME   google.com.
+
+$INCLUDE       Kuserrendszerhaz.hu.+008+06526.key
+$INCLUDE       Kuserrendszerhaz.hu.+008+23760.key
user-lxc repository