local.m4: Track VLAN renumbering in vampire's interface names.

[firewall] / local.m4

diff --git a/local.m4 b/local.m4
index f0e093d..e083a64 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -72,11 +72,14 @@ defnet housebdry virtual
 ## House hosts.
 defhost radius
        hosttype router
-       iface eth0 dmz unsafe safe untrusted default
-       iface eth1 dmz unsafe safe untrusted default
-       iface eth2 safe
-       iface eth3 untrusted default
+       iface eth0 dmz unsafe safe untrusted vpn sgo colobdry default
+       iface eth1 dmz unsafe safe untrusted vpn sgo colobdry default
+       iface eth2 dmz unsafe safe untrusted vpn sgo colobdry
+       iface eth3 untrusted vpn default
        iface t6-he default
+       iface vpn-precision colobdry vpn sgo
+       iface vpn-chiark sgo
+       iface vpn-+ vpn
 defhost roadstar
        iface eth0 dmz unsafe
        iface eth1 dmz unsafe
@@ -90,12 +93,12 @@ defhost artist
        iface eth3 untrusted
 defhost vampire
        hosttype router
-       iface eth0.0 dmz unsafe untrusted safe
-       iface eth0.1 dmz unsafe untrusted safe
-       iface eth0.2 safe
-       iface eth0.3 untrusted
+       iface eth0.4 dmz unsafe untrusted safe vpn sgo colobdry
+       iface eth0.5 dmz unsafe untrusted safe vpn sgo colobdry
+       iface eth0.6 dmz unsafe safe untrusted vpn sgo colobdry
+       iface eth0.7 untrusted
        iface dns0 iodine
-       iface vpn-precision colobdry vpn
+       iface vpn-precision colobdry vpn sgo
        iface vpn-chiark sgo
        iface vpn-+ vpn
 defhost ibanez
@@ -125,9 +128,9 @@ defhost fender
        iface br-colo jump colo
 defhost precision
        hosttype router
-       iface eth0 jump colo
-       iface eth1 jump colo
-       iface vpn-vampire housebdry vpn
+       iface eth0 jump colo sgo
+       iface eth1 jump colo sgo
+       iface vpn-radius housebdry vpn sgo
        iface vpn-chiark sgo
        iface vpn-+ vpn
 defhost telecaster
@@ -197,17 +200,10 @@ case $forward in
            -m state --state ESTABLISHED
 
     ## Allow SSH from safe/noloop to untrusted networks.
-    run iptables -A fwd-spec-nofrag -j ACCEPT \
+    run ip46tables -A fwd-spec-nofrag -j ACCEPT \
            -p tcp --destination-port $port_ssh \
            -m mark --mark $to_untrusted/$MASK_TO
-    run iptables -A fwd-spec-nofrag -j ACCEPT \
-           -p tcp --source-port $port_ssh \
-           -m mark --mark $from_untrusted/$MASK_FROM \
-           -m state --state ESTABLISHED
-    run ip6tables -A fwd-spec-nofrag -j ACCEPT \
-           -p tcp --destination-port $port_ssh \
-           -m mark --mark $to_untrusted/$MASK_TO
-    run ip6tables -A fwd-spec-nofrag -j ACCEPT \
+    run ip46tables -A fwd-spec-nofrag -j ACCEPT \
            -p tcp --source-port $port_ssh \
            -m mark --mark $from_untrusted/$MASK_FROM \
            -m state --state ESTABLISHED