Updated efg.pm (updated routing).

diff --git a/sources/efg.pm/firstboot/01_setupnetworking.sh b/sources/efg.pm/firstboot/01_setupnetworking.sh
index c3ce6412808df67c6672694f935eaea3432b682b..39714fd8ac6acdd5045f5711b5b578e1863135bc 100755 (executable)
--- a/sources/efg.pm/firstboot/01_setupnetworking.sh
+++ b/sources/efg.pm/firstboot/01_setupnetworking.sh
@@ -67,11 +67,11 @@ nmcli connection add \
     ipv4.gateway "188.6.255.9" \
     ipv4.method "manual" \
     ipv4.route-metric 100 \
-    ipv4.route-table 150 \
     ipv4.routes "10.228.0.0/16 192.168.173.1, 192.168.42.0/24 192.168.173.1, 192.168.43.0/24 192.168.173.1" \
     ipv6.method "auto" \
     ipv6.route-metric 200 \
     save yes
+    #ipv4.route-table 150 \
     # magyar telekom -> mt (13 * 10 + 20)
 
 nmcli connection show
@@ -85,11 +85,13 @@ nmcli connection add \
     ipv4.gateway "37.220.137.110" \
     ipv4.method "manual" \
     ipv4.route-metric 100 \
+    ipv4.route-table 30 \
     ipv6.addresses "2a02:d400:0000:f200:000c:18ff:fe03:8961/64" \
     ipv6.gateway "2a02:d400:0000:f200::1" \
     ipv6.method "manual" \
     ipv6.route-metric 100 \
     save yes
+    # ace telekom -> at (1 * 10 + 20)
 
 nmcli connection show
 

diff --git a/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh b/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh
index 6986e1fdaba8199785d73d2c1c3861c902a0c10b..5017c1f163ab9c37342b1ce7268d3abea70416ec 100755 (executable)
--- a/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh
+++ b/sources/efg.pm/postinstall/install/usr/local/bin/setuprouting.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 
-# the vpn server is routed via ACE
-ip rule add priority 64 from 10.228.109.236/32 lookup main
-# everything else is routed via Telekom
-ip rule add priority 256 from 10.228.0.0/16 lookup 150
+# the vpn server and everything from the perimeter network are routed via ACE
+ip rule add priority 64 from 10.228.109.236/32 lookup 30
+ip rule add priority 128 from 192.168.173.0/24 lookup 30
+
+# everything else is routed via Telekom (which is the default)
+#ip rule add priority 256 from 10.228.0.0/16 lookup 150