X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/2b17ac87c0bbb773745e10a72fd2608bda8d0686..78aaac07301dc78e7676a18be5f23f44f6a4ffe7:/local.m4

diff --git a/local.m4 b/local.m4
index e083a64..45e498b 100644
--- a/local.m4
+++ b/local.m4
@@ -60,8 +60,6 @@ defnet safe safe
 defnet untrusted untrusted
 	addr 172.29.198.0/25 2001:470:9740:8001::/64
 	forwards househub
-defnet iodine untrusted
-	addr 172.29.198.128/28
 
 defnet househub virtual
 	forwards housebdry dmz unsafe safe untrusted
@@ -76,6 +74,7 @@ defhost radius
 	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 ppp0 default
 	iface t6-he default
 	iface vpn-precision colobdry vpn sgo
 	iface vpn-chiark sgo
@@ -88,8 +87,8 @@ defhost jem
 	iface eth1 dmz unsafe
 defhost artist
 	hosttype router
-	iface eth0 dmz unsafe
-	iface eth1 dmz unsafe
+	iface eth0 dmz unsafe untrusted
+	iface eth1 dmz unsafe untrusted
 	iface eth3 untrusted
 defhost vampire
 	hosttype router
@@ -97,7 +96,6 @@ defhost vampire
 	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 sgo
 	iface vpn-chiark sgo
 	iface vpn-+ vpn
@@ -117,10 +115,13 @@ defnet colo trusted
 	addr 172.29.199.176/28 2001:ba8:1d9:2::/64
 	forwards colohub
 defnet colohub virtual
-	forwards colobdry jump colo
+	forwards colobdry jump colo iodine
 defnet colobdry virtual
 	forwards colohub hub
 	noxit jump
+defnet iodine untrusted
+	addr 172.29.198.128/28
+	forwards colohub
 
 ## Colocated hosts.
 defhost fender
@@ -142,6 +143,7 @@ defhost stratocaster
 defhost jazz
 	iface eth0 jump colo
 	iface eth1 jump colo
+	iface dns0 iodine
 
 ## Other networks.
 defnet hub virtual