Updated ifg.in (disabled IPv6).

diff --git a/sources/ifg.in/c3d/firstboot/data/nftables.config b/sources/ifg.in/c3d/firstboot/data/nftables.config
index c0e21afb0315ad8f7d4fa41e5ac68fbae244bd22..e8b5af4d9e75cfbc5665da1236ac976ca3b5d58e 100644 (file)
--- a/sources/ifg.in/c3d/firstboot/data/nftables.config
+++ b/sources/ifg.in/c3d/firstboot/data/nftables.config
@@ -22,19 +22,22 @@ define PERIMETER_IF = eth1
 define LOOPBACK_IPV4 = 127.0.0.1
 
 # public addresses
-define PUBLIC_EFG_IPV4       = 37.220.137.97
-define PUBLIC_MX_IPV4        = 37.220.137.98
-define PUBLIC_NS_IPV4        = 37.220.137.99
-define PUBLIC_VPN_IPV4       = 37.220.137.100
-define PUBLIC_WS_IPV4        = 37.220.137.101
-define PUBLIC_MINECRAFT_IPV4 = 37.220.137.102
-define PUBLIC_IPV4_103       = 37.220.137.103
-define PUBLIC_IPV4_104       = 37.220.137.104
-define PUBLIC_IPV4_105       = 37.220.137.105
-define PUBLIC_IPV4_106       = 37.220.137.106
-define PUBLIC_IPV4_107       = 37.220.137.107
-define PUBLIC_DL360E_IPV4    = 37.220.137.108
-define PUBLIC_DL380E_IPV4    = 37.220.137.109
+define PUBLIC_NET_IPV4       = 213.253.216.160
+define PUBLIC_GW_IPV4        = 213.253.216.161
+define PUBLIC_EFG_IPV4       = 213.253.216.162
+define PUBLIC_MX_IPV4        = 213.253.216.163
+define PUBLIC_NS_IPV4        = 213.253.216.164
+define PUBLIC_STORE_IPV4     = 213.253.216.165
+define PUBLIC_VPN_IPV4       = 213.253.216.166
+define PUBLIC_WS_IPV4        = 213.253.216.167
+define PUBLIC_IPV4_168       = 213.253.216.168
+define PUBLIC_IPV4_169       = 213.253.216.169
+define PUBLIC_IPV4_170       = 213.253.216.170
+define PUBLIC_IPV4_171       = 213.253.216.171
+define PUBLIC_IPV4_172       = 213.253.216.172
+define PUBLIC_ZFDL360E_IPV4  = 213.253.216.173
+define PUBLIC_ZFDL380E_IPV4  = 213.253.216.174
+define PUBLIC_BROADCAST_IPV4 = 213.253.216.175
 
 # efg address (perimeter network)
 define EFG_PERIMETER_IPV4 = 192.168.173.254

diff --git a/sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 17f7f8611897d8bea76067403d043934dafb8cc3..f44cf41f9c85894ac04fe04e6e95c684606e6cbc 100755 (executable)
--- a/sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/ifg.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -45,6 +45,10 @@ done
 INTERNAL_DEVICE=eth0
 PM_DEVICE=eth1
 
+#    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:6dfe/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.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id internal \
@@ -55,12 +59,12 @@ nmcli connection add \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.method "manual" \
     ipv4.routes "172.16.223.0/24 10.228.109.236, 172.24.232.0/24 10.228.109.236, 10.162.0.0/16 10.228.109.236" \
-    ipv6.addresses "2a02:d400:0000:f268:000c:18ff:fe03:6dfe/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.method "manual" \
+    ipv6.method "disabled" \
     save yes
 
+#    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:ad01/64" \
+#    ipv6.gateway "2a02:d400:0000:f2ad:000c:18ff:fe03:adfe" \
+#    ipv6.method "manual" \
 nmcli connection add \
     connection.autoconnect yes \
     connection.id perimeter \
@@ -69,9 +73,7 @@ nmcli connection add \
     ipv4.addresses "192.168.173.1/24" \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
-    ipv6.addresses "2a02:d400:0000:f2ad:000c:18ff:fe03:ad01/64" \
-    ipv6.gateway "2a02:d400:0000:f2ad:000c:18ff:fe03:adfe" \
-    ipv6.method "manual" \
+    ipv6.method "disabled" \
     save yes
 
 nmcli connection show

diff --git a/sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh b/sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh
index 3f86f82139221d4abf6190fce4a218dfb12a4b8c..62e7056e6b18ea8be08594cf7d01742451b5ceac 100755 (executable)
--- a/sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh
+++ b/sources/ifg.in/c3d/postinstall/scripts/10_setupservices.sh
@@ -2,6 +2,6 @@
 
 
 systemctl enable NetworkManager-wait-online.service
-systemctl enable radvd.service
+systemctl disable radvd.service
 
 systemctl enable logrotate.timer