From: Zoltán Felleg Date: Fri, 17 May 2019 07:05:16 +0000 (+0200) Subject: Updated efg.pm.f29 (revert to old IP addresses), pns.usr.f29 (added icell ac922). X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=344743a20b04261a0068cb0235b3f90c00238375;p=user-lxc.git Updated efg.pm.f29 (revert to old IP addresses), pns.usr.f29 (added icell ac922). --- diff --git a/sources/efg.pm.f29/firstboot/11_iptables_set_efg_rules.sh b/sources/efg.pm.f29/firstboot/11_iptables_set_efg_rules.sh index 69a80d8..93d1a8a 100755 --- a/sources/efg.pm.f29/firstboot/11_iptables_set_efg_rules.sh +++ b/sources/efg.pm.f29/firstboot/11_iptables_set_efg_rules.sh @@ -442,7 +442,7 @@ $IPTABLES --table filter --append OUTPUT \ $IPTABLES --table nat --append POSTROUTING \ --source ${USR_NET},${SR_NET},$IN_NET \ --out-interface $EXTERNAL_IF_DYNAMIC \ - --jump SNAT --to-source $PUBLIC_IP_146 + --jump SNAT --to-source $PUBLIC_IP_202 # snat packets # from the usr, sr and in networks $IPTABLES --table nat --append POSTROUTING \ diff --git a/sources/pns.usr.f29/firstboot/01_setupnetworking.sh b/sources/pns.usr.f29/firstboot/01_setupnetworking.sh index c5d2f05..3efc725 100755 --- a/sources/pns.usr.f29/firstboot/01_setupnetworking.sh +++ b/sources/pns.usr.f29/firstboot/01_setupnetworking.sh @@ -41,10 +41,10 @@ nmcli connection delete uuid "$CONNECTION_UUID" nmcli connection add \ connection.autoconnect yes \ - connection.id perimeter \ + connection.id internal \ connection.interface-name $CONNECTION_DEVICE \ connection.type 802-3-ethernet \ - ipv4.addresses "10.228.109.174/24" \ + ipv4.addresses "10.228.109.174/16" \ ipv4.dns "10.228.109.104, 10.228.109.253" \ ipv4.dns-search "usr.user.hu" \ ipv4.gateway "10.228.109.254" \ diff --git a/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone b/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone index 5e81229..2bca467 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/228.10.in-addr.arpa.zone +++ b/sources/pns.usr.f29/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. ( - 2019022701 ; Serial + 2019042301 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -352,6 +352,7 @@ $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. ; ================================================================ ; acsiba (ac = 1 * 10 + 3 = 13) diff --git a/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone b/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone index c110b02..9b9357d 100644 --- a/sources/pns.usr.f29/postinstall/install/var/named/usr.user.hu.zone +++ b/sources/pns.usr.f29/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. ( - 2019022701 ; Serial + 2019042301 ; Serial 86400 ; Refresh (1 day) 7200 ; Retry (2 hours) 2419200 ; Expire (4 weeks) @@ -370,6 +370,7 @@ 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 ; ================================================================ ; acsiba (ac = 1 * 10 + 3 = 13)