Updated efg.pm (default route is now ACE), nameservers (switched user.hu to useribm...

diff --git a/sources/efg.pm/firstboot/01_setupnetworking.sh b/sources/efg.pm/firstboot/01_setupnetworking.sh
index c8f6874815af39ad004bc2287bec0772aa55a10d..d1e7473697fb5e2e4ccdd6bfeac9207cca791677 100755 (executable)
--- a/sources/efg.pm/firstboot/01_setupnetworking.sh
+++ b/sources/efg.pm/firstboot/01_setupnetworking.sh
@@ -60,7 +60,6 @@ nmcli connection add \
     connection.interface-name $EXTERNAL_TELEKOM_DEVICE \
     connection.type 802-3-ethernet \
     ipv4.addresses "192.168.65.1/24, 194.149.40.146/28, 194.149.40.147/28, 194.149.40.148/28, 194.149.40.149/28, 194.149.40.150/28" \
-    ipv4.gateway "194.149.40.145" \
     ipv4.method "manual" \
     ipv6.method "auto" \
     save yes
@@ -73,8 +72,8 @@ nmcli connection add \
     connection.interface-name $EXTERNAL_ACE_DEVICE \
     connection.type 802-3-ethernet \
     ipv4.addresses "37.220.137.97/28, 37.220.137.98/28, 37.220.137.99/28, 37.220.137.100/28, 37.220.137.101/28" \
+    ipv4.gateway "37.220.137.110" \
     ipv4.method "manual" \
-    ipv4.routes "0.0.0.0/0 37.220.137.110 table=13" \
     ipv6.method "auto" \
     save yes
 

diff --git a/sources/ins.usr/config b/sources/ins.usr/config
index 90542e8baf50aad381dae8d269dc9a3cd3995a6f..00ed33ec3c5a528c06bf626486fd34568c58c5fd 100644 (file)
--- a/sources/ins.usr/config
+++ b/sources/ins.usr/config
@@ -1,7 +1,7 @@
 lxc.include = /usr/share/lxc/config/common.conf
 
 lxc.arch = x86_64
-lxc.uts.name = ins.usr.user.hu
+lxc.uts.name = ins.in.useribm.hu
 lxc.rootfs.path = __CONTAINER_PATH__/rootfs
 lxc.mount.auto = proc:rw sys:ro
 

diff --git a/sources/ins.usr/firstboot/01_setupnetworking.sh b/sources/ins.usr/firstboot/01_setupnetworking.sh
index a8bc7f43c469e27fa0bbcfe6dc3e7df2f8adc023..45edc5c3c5e195df963653dd76d328197006bca7 100755 (executable)
--- a/sources/ins.usr/firstboot/01_setupnetworking.sh
+++ b/sources/ins.usr/firstboot/01_setupnetworking.sh
@@ -46,7 +46,7 @@ nmcli connection add \
     connection.type 802-3-ethernet \
     ipv4.addresses "10.228.109.104/16" \
     ipv4.dns "10.228.109.253, 10.228.109.104" \
-    ipv4.dns-search "usr.user.hu" \
+    ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
     ipv6.method "auto" \

diff --git a/sources/ins.usr/postinstall/install/etc/named.conf b/sources/ins.usr/postinstall/install/etc/named.conf
index ccfb84853d95d3735f9b57c2f23ad572b0d7a1f2..15a274a03c449b8a3c92790708b840306c5c4882 100644 (file)
--- a/sources/ins.usr/postinstall/install/etc/named.conf
+++ b/sources/ins.usr/postinstall/install/etc/named.conf
@@ -190,10 +190,10 @@ view "internal" {
        };
 
        # perimeter zones
-       zone "pm.user.hu" IN {
+       zone "pm.useribm.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/pm.user.hu.zone";
+               file "slaves/pm.useribm.hu.zone";
        };
        zone "173.168.192.in-addr.arpa" IN {
                type slave;
@@ -205,21 +205,21 @@ view "internal" {
        zone "mediacube.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/mediacube.hu.zone";
+               file "slaves/mediacube.hu.zone.signed";
        };
        zone "useredms.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/useredms.hu.zone";
+               file "slaves/useredms.hu.zone.signed";
        };
        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.pm/config b/sources/pns.pm/config
index d2bf14269e7b44daccd4a00b19516beeabaf44b6..9f857ea06afeb43b010f97672eb5d80ca283ee71 100644 (file)
--- a/sources/pns.pm/config
+++ b/sources/pns.pm/config
@@ -1,7 +1,7 @@
 lxc.include = /usr/share/lxc/config/common.conf
 
 lxc.arch = x86_64
-lxc.uts.name = pns.pm.user.hu
+lxc.uts.name = pns.pm.useribm.hu
 lxc.rootfs.path = __CONTAINER_PATH__/rootfs
 lxc.mount.auto = proc:rw sys:ro
 

diff --git a/sources/pns.pm/firstboot/01_setupnetworking.sh b/sources/pns.pm/firstboot/01_setupnetworking.sh
index 76ed3588bf989e87e9f2b66241a7e2cb6441641b..ded368562d164a8d6fe97743cbf004fcf671caeb 100755 (executable)
--- a/sources/pns.pm/firstboot/01_setupnetworking.sh
+++ b/sources/pns.pm/firstboot/01_setupnetworking.sh
@@ -46,7 +46,7 @@ nmcli connection add \
     connection.type 802-3-ethernet \
     ipv4.addresses "192.168.173.174/24" \
     ipv4.dns "127.0.0.1" \
-    ipv4.dns-search "pm.user.hu" \
+    ipv4.dns-search "pm.useribm.hu" \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
     ipv4.routes "10.228.0.0/16 192.168.173.1" \

diff --git a/sources/pns.pm/postinstall/install/etc/named.conf b/sources/pns.pm/postinstall/install/etc/named.conf
index 66e614ac9099c8b816abef1fea1682c90047c951..3615ebcde61542626690bdd3a895b8488e034ddc 100644 (file)
--- a/sources/pns.pm/postinstall/install/etc/named.conf
+++ b/sources/pns.pm/postinstall/install/etc/named.conf
@@ -170,10 +170,10 @@ view "perimeter" {
        };
 
        # perimeter zones
-       zone "pm.user.hu" IN {
+       zone "pm.useribm.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/pm.user.hu.zone";
+               file "slaves/pm.useribm.hu.zone";
        };
        zone "173.168.192.in-addr.arpa" IN {
                type slave;

diff --git a/sources/pns.usr/postinstall/install/etc/named.conf b/sources/pns.usr/postinstall/install/etc/named.conf
index 2fd354ed6dad26d264112c13da7b082c8dcfab49..c7abfbfe3765340ba6e98d15eb79f7078d582bd4 100644 (file)
--- a/sources/pns.usr/postinstall/install/etc/named.conf
+++ b/sources/pns.usr/postinstall/install/etc/named.conf
@@ -228,9 +228,9 @@ view "internal" {
        };
 
        # perimeter zones
-       zone "pm.user.hu" IN {
+       zone "pm.useribm.hu" IN {
                type master;
-               file "pm.user.hu.zone";
+               file "pm.useribm.hu.zone";
        };
        zone "173.168.192.in-addr.arpa" IN {
                type master;
@@ -316,9 +316,9 @@ view "perimeter" {
        };
 
        # perimeter zones
-       zone "pm.user.hu" IN {
+       zone "pm.useribm.hu" IN {
                type master;
-               file "pm.user.hu.zone";
+               file "pm.useribm.hu.zone";
        };
        zone "173.168.192.in-addr.arpa" IN {
                type master;

diff --git a/sources/pns.usr/postinstall/install/var/named/173.168.192.in-addr.arpa.zone b/sources/pns.usr/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
index 1a9c5d729115bb330ad6360a125854926edb3473..79519531c59246ec213109a88cb237ba6608c04b 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
+++ b/sources/pns.usr/postinstall/install/var/named/173.168.192.in-addr.arpa.zone
@@ -1,24 +1,21 @@
 $TTL   86400
-@      IN      SOA     ns.pm.user.hu.  hostmaster.mx.pm.user.hu.       (
-                                       2018100901      ; Serial
+@      IN      SOA     pns.pm.useribm.hu.      hostmaster.mx.pm.useribm.hu.    (
+                                       2021031701      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
                                        3600)           ; Minimum (1 hour)
 
-@              IN      NS      ns.pm.user.hu.
+@              IN      NS      pns.pm.useribm.hu.
 
-254            IN      PTR     efg.pm.user.hu.
-253            IN      PTR     svc.pm.user.hu.
-252            IN      PTR     oldwww.pm.user.hu.
-251            IN      PTR     oldxfr.pm.user.hu.
-250            IN      PTR     whmcs.pm.user.hu.
+254            IN      PTR     efg.pm.useribm.hu.
+253            IN      PTR     mx.pm.useribm.hu.
 
-249            IN      PTR     ws.pm.user.hu.
-246            IN      PTR     xfr.pm.user.hu.
-223            IN      PTR     vc.pm.user.hu.
-193            IN      PTR     dvredmine.pm.user.hu.
-174            IN      PTR     pns.pm.user.hu.
-64             IN      PTR     ens.pm.user.hu.
+249            IN      PTR     ws.pm.useribm.hu.
+246            IN      PTR     xfr.pm.useribm.hu.
+223            IN      PTR     vc.pm.useribm.hu.
+193            IN      PTR     dvredmine.pm.useribm.hu.
+174            IN      PTR     pns.pm.useribm.hu.
+64             IN      PTR     ens.pm.useribm.hu.
 
-1              IN      PTR     ifg.pm.user.hu.
+1              IN      PTR     ifg.pm.useribm.hu.

diff --git a/sources/pns.usr/postinstall/install/var/named/pm.user.hu.zone b/sources/pns.usr/postinstall/install/var/named/pm.useribm.hu.zone
similarity index 70%
rename from sources/pns.usr/postinstall/install/var/named/pm.user.hu.zone
rename to sources/pns.usr/postinstall/install/var/named/pm.useribm.hu.zone
index 00f0a020d50a43164097325bb00a1183e1d88f14..e5e6a5b96e4f9d8ef8a43bc52b704b16ddb7076d 100644 (file)
--- a/sources/pns.usr/postinstall/install/var/named/pm.user.hu.zone
+++ b/sources/pns.usr/postinstall/install/var/named/pm.useribm.hu.zone
@@ -1,6 +1,6 @@
 $TTL   86400
-@      IN      SOA     ns.pm.user.hu.  hostmaster.mx.pm.user.hu.       (
-                                       2018100901      ; Serial
+@      IN      SOA     pns.pm.useribm.hu.      hostmaster.mx.pm.useribm.hu.    (
+                                       2021031701      ; Serial
                                        86400           ; Refresh (1 day)
                                        7200            ; Retry (2 hours)
                                        2419200         ; Expire (4 weeks)
@@ -9,19 +9,13 @@ $TTL  86400
 ; 12345678901234567890123456
 ; abcdefghijklmnopqrstuvwxyz
 
-@              IN      NS      ns
+@              IN      NS      pns
 @              IN      MX      10      mx
 @              IN      A       192.168.173.249
 
 efg            IN      A       192.168.173.254 ; efg
-svc            IN      A       192.168.173.253 ; svc
-ns             IN      A       192.168.173.253 ; ns
 mx             IN      A       192.168.173.253 ; mx
 
-oldwww         IN      A       192.168.173.252 ; www
-oldxfr         IN      A       192.168.173.251 ; xfr
-whmcs          IN      A       192.168.173.250 ; whmcs
-
 ws             IN      A       192.168.173.249 ; ws
 www            IN      A       192.168.173.249 ; ws
 xfr            IN      A       192.168.173.246 ; xf

diff --git a/sources/svc.usr/config b/sources/svc.usr/config
index 6760e7515fdb25d7ebb0020d0d80d48b8c962d39..8a316da87dea7358d893a1cb79096665b95a0826 100644 (file)
--- a/sources/svc.usr/config
+++ b/sources/svc.usr/config
@@ -1,7 +1,7 @@
 lxc.include = /usr/share/lxc/config/common.conf
 
 lxc.arch = x86_64
-lxc.uts.name = svc.usr.user.hu
+lxc.uts.name = svc.in.useribm.hu
 lxc.rootfs.path = __CONTAINER_PATH__/rootfs
 lxc.mount.auto = proc:rw sys:ro
 

diff --git a/sources/svc.usr/firstboot/01_setupnetworking.sh b/sources/svc.usr/firstboot/01_setupnetworking.sh
index eaa446dd228d6d9394fae515d1a3d8814b1c5b25..8295ffb4e160a1e6b3ba3ef30f4c2f799a10d90b 100755 (executable)
--- a/sources/svc.usr/firstboot/01_setupnetworking.sh
+++ b/sources/svc.usr/firstboot/01_setupnetworking.sh
@@ -46,7 +46,7 @@ nmcli connection add \
     connection.type 802-3-ethernet \
     ipv4.addresses "10.228.109.253/16" \
     ipv4.dns "10.228.109.104, 10.228.109.253" \
-    ipv4.dns-search "usr.user.hu" \
+    ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \
     ipv4.method "manual" \
     ipv6.method "auto" \

diff --git a/sources/svc.usr/postinstall/install/etc/dhcp/dhcpd.conf b/sources/svc.usr/postinstall/install/etc/dhcp/dhcpd.conf
index cb635a1df0f714c80e3d512e214fa08919abac53..75197809b471ab4a00dbce3d491c1cd0882d414f 100644 (file)
--- a/sources/svc.usr/postinstall/install/etc/dhcp/dhcpd.conf
+++ b/sources/svc.usr/postinstall/install/etc/dhcp/dhcpd.conf
@@ -5,12 +5,12 @@
 
 # Option definitions
 option broadcast-address   10.228.255.255;
-option domain-name         "usr.user.hu";
-option domain-name-servers svc.usr.user.hu, ins.usr.user.hu;
-option domain-search       "usr.user.hu", "sr.user.hu", "in.user.hu";
-option ntp-servers         ntp1.usr.user.hu, ntp2.usr.user.hu;
-option routers             ifg.usr.user.hu;
-option smtp-server         mx.usr.user.hu;
+option domain-name         "in.useribm.hu";
+option domain-name-servers svc.in.useribm.hu, ins.in.useribm.hu;
+option domain-search       "in.useribm.hu", "sr.user.hu", "in.user.hu";
+option ntp-servers         ntp1.in.useribm.hu, ntp2.in.useribm.hu;
+option routers             ifg.in.useribm.hu;
+option smtp-server         mx.in.useribm.hu;
 option subnet-mask         255.255.0.0;
 option time-offset         3600;
 
@@ -47,7 +47,7 @@ authoritative;
 # have to hack syslog.conf to complete the redirection).
 log-facility local7;
 
-# usr.user.hu subnet
+# in.useribm.hu subnet
 subnet 10.228.0.0 netmask 255.255.0.0 {
        range 10.228.43.1 10.228.43.254;
        vendor-option-space apc;

diff --git a/sources/svc.usr/postinstall/install/etc/named.conf b/sources/svc.usr/postinstall/install/etc/named.conf
index 67059f0af09948e8a85963e924595590bbc0f44d..15a274a03c449b8a3c92790708b840306c5c4882 100644 (file)
--- a/sources/svc.usr/postinstall/install/etc/named.conf
+++ b/sources/svc.usr/postinstall/install/etc/named.conf
@@ -143,6 +143,16 @@ view "internal" {
                masters { primary_ns_master; };
                file "slaves/43.168.192.in-addr.arpa.zone";
        };
+       zone "in.useribm.hu" IN {
+               type slave;
+               masters { primary_ns_master; };
+               file "slaves/in.useribm.hu.zone";
+       };
+       zone "228.10.in-addr.arpa" IN {
+               type slave;
+               masters { primary_ns_master; };
+               file "slaves/228.10.in-addr.arpa.zone";
+       };
        zone "mlx1.user.hu" IN {
                type slave;
                masters { primary_ns_master; };
@@ -163,16 +173,6 @@ view "internal" {
                masters { primary_ns_master; };
                file "slaves/132.16.172.in-addr.arpa.zone";
        };
-       zone "mlx.user.hu" IN {
-               type slave;
-               masters { primary_ns_master; };
-               file "slaves/mlx.user.hu.zone";
-       };
-       zone "144.16.172.in-addr.arpa" IN {
-               type slave;
-               masters { primary_ns_master; };
-               file "slaves/144.16.172.in-addr.arpa.zone";
-       };
        zone "sr.user.hu" IN {
                type slave;
                masters { primary_ns_master; };
@@ -188,17 +188,12 @@ view "internal" {
                masters { primary_ns_master; };
                file "slaves/usr.user.hu.zone";
        };
-       zone "228.10.in-addr.arpa" IN {
-               type slave;
-               masters { primary_ns_master; };
-               file "slaves/228.10.in-addr.arpa.zone";
-       };
 
        # perimeter zones
-       zone "pm.user.hu" IN {
+       zone "pm.useribm.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/pm.user.hu.zone";
+               file "slaves/pm.useribm.hu.zone";
        };
        zone "173.168.192.in-addr.arpa" IN {
                type slave;
@@ -210,21 +205,21 @@ view "internal" {
        zone "mediacube.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/mediacube.hu.zone";
+               file "slaves/mediacube.hu.zone.signed";
        };
        zone "useredms.hu" IN {
                type slave;
                masters { primary_ns_master; };
-               file "slaves/useredms.hu.zone";
+               file "slaves/useredms.hu.zone.signed";
        };
        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/vpn.usr/envvars b/sources/vpn.usr/envvars
index e4664eaa3c60f81b071643c7173555c2b2f6f09e..1f434ea71c50ee8c1c5e62010656b7f8ceb08bf1 100644 (file)
--- a/sources/vpn.usr/envvars
+++ b/sources/vpn.usr/envvars
@@ -2,4 +2,4 @@ DISTRIBUTION=Fedora
 DISTRIBUTION_VERSION=33
 ROOT_PACKAGES="hostname initscripts iproute rootfiles systemd-udev"
 BASE_PACKAGES="NetworkManager iputils logrotate rsyslog tar vim-minimal"
-SPEC_PACKAGES="cronie easy-rsa openvpn rpm"
+SPEC_PACKAGES="cronie easy-rsa openssh-clients openssh-server openvpn rpm"

diff --git a/sources/vpn.usr/postinstall/install/etc/openvpn/server/server.conf b/sources/vpn.usr/postinstall/install/etc/openvpn/server/server.conf
index e3b8c91630eb877e6339462137154637a8a11737..046f766aae2296ef120f0169e523813fd0a8e167 100644 (file)
--- a/sources/vpn.usr/postinstall/install/etc/openvpn/server/server.conf
+++ b/sources/vpn.usr/postinstall/install/etc/openvpn/server/server.conf
@@ -206,6 +206,7 @@ route 10.162.104.0 255.255.255.0
 # DNS servers provided by opendns.com.
 ;push "dhcp-option DNS 208.67.222.222"
 ;push "dhcp-option DNS 208.67.220.220"
+push "dhcp-option DNS 10.228.109.104"
 push "dhcp-option DNS 10.228.109.253"
 
 # Uncomment this directive to allow different