X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/44f9582788168b13a9163138f5e55bba889712e7..37024968756988bf2ba4277a9b8040294cc2a81a:/local.m4

diff --git a/local.m4 b/local.m4
index d084db4..54d0c86 100644
--- a/local.m4
+++ b/local.m4
@@ -60,11 +60,6 @@ defnet safe safe
 defnet untrusted untrusted
 	addr 172.29.198.0/25 2001:470:9740:8001::/64
 	forwards househub
-defnet vpn safe
-	addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
-	forwards househub colohub
-	host crybaby 1
-	host terror 2
 defnet iodine untrusted
 	addr 172.29.198.128/28
 
@@ -76,7 +71,7 @@ defnet housebdry virtual
 
 ## House hosts.
 defhost radius
-	router
+	hosttype router
 	iface eth0 dmz unsafe safe
 	iface eth1 dmz unsafe safe
 	iface eth2 safe
@@ -91,19 +86,21 @@ defhost artist
 	iface eth0 dmz unsafe
 	iface eth1 dmz unsafe
 defhost vampire
-	router
+	hosttype router
 	iface eth0.0 dmz unsafe safe
 	iface eth0.1 dmz unsafe safe
 	iface eth0.2 safe
 	iface eth0.3 untrusted
-	iface dns0 dns
-	iface vpn-+ vpn
+	iface dns0 iodine
 	iface vpn-precision colobdry vpn
+	iface vpn-chiark sgo
+	iface vpn-+ vpn
 defhost ibanez
 	iface br-dmz dmz unsafe
 	iface br-unsafe unsafe
 
 defhost gibson
+	hosttype client
 	iface eth0 unsafe
 
 ## Colocated networks.
@@ -124,11 +121,12 @@ defhost fender
 	iface br-jump jump colo
 	iface br-colo jump colo
 defhost precision
-	router
+	hosttype router
 	iface eth0 jump colo
 	iface eth1 jump colo
-	iface vpn-+ vpn
 	iface vpn-vampire housebdry vpn
+	iface vpn-chiark sgo
+	iface vpn-+ vpn
 defhost telecaster
 	iface eth0 jump colo
 	iface eth1 jump colo
@@ -142,11 +140,25 @@ defhost jazz
 ## Other networks.
 defnet hub virtual
 	forwards housebdry colobdry
+defnet sgo noloop
+	addr !172.29.198.0/23
+	addr 10.0.0.0/8
+	addr 172.16.0.0/12
+	addr 192.168.0.0/16
+	forwards househub colohub
+defnet vpn safe
+	addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
+	forwards househub colohub
+	host crybaby 1
+	host terror 2
+defnet anycast trusted
+	addr 172.29.199.224/27 2001:ba8:1d9:0::/64
+	forwards dmz unsafe safe untrusted jump colo vpn
 defnet default untrusted
 	addr 62.49.204.144/28 2001:470:1f09:1b98::/64
 	addr 212.13.198.64/28 2001:ba8:0:1d9::/64
 	addr 2001:ba8:1d9::/48 #temporary
-	forwards dmz untrusted unsafe jump colo
+	forwards dmz unsafe untrusted jump colo
 
 m4_divert(80)m4_dnl
 ###--------------------------------------------------------------------------