X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/ebaa31a7bdb640c1bd797fef04d1e833a34c07d7..960a999671b6958a40f71e68316d41402521957c:/local.m4

diff --git a/local.m4 b/local.m4
index 357043b..9dfc464 100644
--- a/local.m4
+++ b/local.m4
@@ -71,11 +71,15 @@ defnet housebdry virtual
 
 ## House hosts.
 defhost radius
-	router
-	iface eth0 dmz unsafe safe
-	iface eth1 dmz unsafe safe
-	iface eth2 safe
-	iface eth3 untrusted
+	hosttype router
+	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
@@ -83,16 +87,18 @@ defhost jem
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
 defhost artist
+	hosttype router
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
+	iface eth3 untrusted
 defhost vampire
-	router
-	iface eth0.0 dmz unsafe safe
-	iface eth0.1 dmz unsafe safe
-	iface eth0.2 safe
+	hosttype router
+	iface eth0.0 dmz unsafe untrusted safe vpn sgo colobdry
+	iface eth0.1 dmz unsafe untrusted safe vpn sgo colobdry
+	iface eth0.2 dmz unsafe safe untrusted vpn sgo colobdry
 	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
@@ -100,6 +106,7 @@ defhost ibanez
 	iface br-unsafe unsafe
 
 defhost gibson
+	hosttype client
 	iface eth0 unsafe
 
 ## Colocated networks.
@@ -120,10 +127,10 @@ defhost fender
 	iface br-jump jump colo
 	iface br-colo jump colo
 defhost precision
-	router
-	iface eth0 jump colo
-	iface eth1 jump colo
-	iface vpn-vampire housebdry vpn
+	hosttype router
+	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