local.m4: Add the colocated servers to the VPN.

diff --git a/local.m4 b/local.m4
index f0e093d..410e523 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 safe vpn
+       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.0 dmz unsafe untrusted safe vpn sgo colobdry
+       iface eth0.1 dmz unsafe untrusted safe vpn sgo colobdry
        iface eth0.2 safe
        iface eth0.3 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