From: Zoltán Felleg Date: Wed, 4 Mar 2020 10:12:40 +0000 (+0100) Subject: Updated efg.pm, ifg.in (allow gre), pns.usr (added t1600g-52ts-sri). X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=fc953ce8db4b2178da2a16e686dff868be81054a;p=user-lxc.git Updated efg.pm, ifg.in (allow gre), pns.usr (added t1600g-52ts-sri). --- diff --git a/sources/efg.pm/firstboot/nftables.config b/sources/efg.pm/firstboot/nftables.config index 29b1867..0cbf00b 100644 --- a/sources/efg.pm/firstboot/nftables.config +++ b/sources/efg.pm/firstboot/nftables.config @@ -167,6 +167,10 @@ add rule ip efg_filter input \ ip protocol icmp \ counter accept comment "ICMP" +add rule ip efg_filter input \ + ip protocol gre \ + counter accept comment "GRE" + add rule ip efg_filter input \ counter log prefix "INPUT" diff --git a/sources/ifg.usr/firstboot/nftables.config b/sources/ifg.usr/firstboot/nftables.config index d1ef41d..f0f5b36 100644 --- a/sources/ifg.usr/firstboot/nftables.config +++ b/sources/ifg.usr/firstboot/nftables.config @@ -169,6 +169,10 @@ add rule inet ifg_filter input \ ip protocol icmp \ counter accept comment "ICMP" +add rule inet ifg_filter input \ + ip protocol gre \ + counter accept comment "GRE" + add rule inet ifg_filter input \ counter log prefix "INPUT" diff --git a/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone b/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone index aef8ec8..bb95503 100644 --- a/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone +++ b/sources/pns.usr/postinstall/install/var/named/228.10.in-addr.arpa.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.usr.user.hu. hostmaster.mx.usr.user.hu. ( - 2020020701 ; Serial + 2020030401 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -77,38 +77,13 @@ $TTL 86400 44.192 IN PTR mkbdarc2dev.usr.user.hu. 40.192 IN PTR blobtest.usr.user.hu. -; ================================================================ -; rkonkoly (rk = 18 * 10 + 11 = 191) -; ================================================================ -1.191 IN PTR rkdominoadmin.usr.user.hu. - -; ================================================================ -; redhat gluster storage server sandbox (rs = 18 * 10 + 7 = 187) -; ================================================================ -3.187 IN PTR rhgssn3.usr.user.hu. -2.187 IN PTR rhgssn2.usr.user.hu. -1.187 IN PTR rhgssn1.usr.user.hu. - -; ================================================================ -; purebackup (pb = 16 * 10 + 2 = 162) -; ================================================================ -242.162 IN PTR purebcw2k12.usr.user.hu. -238.162 IN PTR purebcw2k08.usr.user.hu. -233.162 IN PTR purebcw2k03.usr.user.hu. -187.162 IN PTR purebcrhel7.usr.user.hu. -186.162 IN PTR purebcrhel6.usr.user.hu. -106.162 IN PTR purebcwdb2105.usr.user.hu. -105.162 IN PTR purebcldb2105.usr.user.hu. -97.162 IN PTR purebcldb297.usr.user.hu. -17.162 IN PTR purebcaix71.usr.user.hu. - ; ================================================================ ; network switches (ns = 14 * 10 + 19 = 159) ; ================================================================ 211.159 IN PTR t1600g-28ts-sfu.usr.user.hu. 203.159 IN PTR smcgs24c-srm.usr.user.hu. 202.159 IN PTR t1600g-28ts-sfl.usr.user.hu. -199.159 IN PTR t1600g-28ts-sri.usr.user.hu. +199.159 IN PTR t1600g-52ts-sri.usr.user.hu. 195.159 IN PTR smcgs24c-sre.usr.user.hu. 81.159 IN PTR t1600g-28ts-ffu.usr.user.hu. 72.159 IN PTR t1600g-28ts-ffl.usr.user.hu. @@ -173,7 +148,7 @@ $TTL 86400 245.103 IN PTR v5010svc1.usr.user.hu. 227.103 IN PTR v5010b.usr.user.hu. 225.103 IN PTR v5010.usr.user.hu. -6.103 IN PTR vhost6imm.usr.user.hu. +6.103 IN PTR vhost6ilo.usr.user.hu. 5.103 IN PTR vhost5xcc.usr.user.hu. 4.103 IN PTR vhost4xcc.usr.user.hu. 3.103 IN PTR vhost3imm.usr.user.hu. @@ -304,8 +279,6 @@ $GENERATE 100-254 $.43 IN PTR dhcp$.usr.user.hu. ; ================================================================ 13.19 IN PTR aiac922.usr.user.hu. 12.19 IN PTR aiac922bmc.usr.user.hu. -10.19 IN PTR aiac922icell.usr.user.hu. -9.19 IN PTR aiac922icellbmc.usr.user.hu. ; ================================================================ ; acsiba (ac = 1 * 10 + 3 = 13) diff --git a/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone b/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone index 12c922b..2312773 100644 --- a/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone +++ b/sources/pns.usr/postinstall/install/var/named/usr.user.hu.zone @@ -1,6 +1,6 @@ $TTL 86400 @ IN SOA ns.usr.user.hu. hostmaster.mx.usr.user.hu. ( - 2020020701 ; Serial + 2020030401 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -80,38 +80,13 @@ oratest IN A 10.228.192.70 ; ot mkbdarc2dev IN A 10.228.192.44 ; dd blobtest IN A 10.228.192.40 ; bt -; ================================================================ -; rkonkoly (rk = 18 * 10 + 11 = 191) -; ================================================================ -rkdominoadmin IN A 10.228.191.1 - -; ================================================================ -; redhat gluster storage server sandbox (rg = 18 * 10 + 7 = 187) -; ================================================================ -rhgssn3 IN A 10.228.187.3 ; node 2 -rhgssn2 IN A 10.228.187.2 ; node 2 -rhgssn1 IN A 10.228.187.1 ; node 1 - -; ================================================================ -; purebackup (pb = 16 * 10 + 2 = 162) -; ================================================================ -purebcw2k12 IN A 10.228.162.242 -purebcw2k08 IN A 10.228.162.238 -purebcw2k03 IN A 10.228.162.233 -purebcrhel7 IN A 10.228.162.187 -purebcrhel6 IN A 10.228.162.186 -purebcwdb2105 IN A 10.228.162.106 -purebcldb2105 IN A 10.228.162.105 -purebcldb297 IN A 10.228.162.97 -purebcaix71 IN A 10.228.162.17 - ; ================================================================ ; network switches (ns = 14 * 10 + 19 = 159) ; ================================================================ t1600g-28ts-sfu IN A 10.228.159.211 ; su (second floor upper) -smcgs24c-srm IN A 10.228.159.203 ; sm (server room management) +t1600g-28ts-srm IN A 10.228.159.203 ; sm (server room management) t1600g-28ts-sfl IN A 10.228.159.202 ; sl (second floor lower) -t1600g-28ts-sri IN A 10.228.159.199 ; si (server room internal) +t1600g-52ts-sri IN A 10.228.159.199 ; si (server room internal) smcgs24c-sre IN A 10.228.159.195 ; se (server room external) t1600g-28ts-ffu IN A 10.228.159.81 ; fu (first floor upper) t1600g-28ts-ffl IN A 10.228.159.72 ; fl (first floor lower) @@ -180,7 +155,7 @@ v5010svc2 IN A 10.228.103.246 ; v5 + (s + 2) v5010svc1 IN A 10.228.103.245 ; v5 + (s + 1) v5010b IN A 10.228.103.227 ; v5 + b v5010 IN A 10.228.103.225 ; v5 -vhost6imm IN A 10.228.103.6 +vhost6ilo IN A 10.228.103.6 vhost5xcc IN A 10.228.103.5 vhost4xcc IN A 10.228.103.4 vhost3imm IN A 10.228.103.3 @@ -314,8 +289,6 @@ akminecraft IN A 10.228.21.1 ; ================================================================ aiac922 IN A 10.228.19.13 ; ac aiac922bmc IN A 10.228.19.12 ; ab -aiac922icell IN A 10.228.19.10 -aiac922icellbmc IN A 10.228.19.9 ; ================================================================ ; acsiba (ac = 1 * 10 + 3 = 13) diff --git a/sources/vpn.usr/config b/sources/vpn.usr/config index 018e069..e8c37f8 100644 --- a/sources/vpn.usr/config +++ b/sources/vpn.usr/config @@ -13,7 +13,7 @@ lxc.net.0.hwaddr = 02:0c:18:03:6d:ec lxc.autodev = 1 lxc.hook.autodev = __CONTAINER_PATH__/hooks/autodev -lxc.cgroup.devices.allow = c 10:200 rwm +lxc.cgroup.devices.allow = lxc.cgroup.devices.deny = lxc.signal.halt = SIGRTMIN+4