From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 11 Dec 2012 09:32:36 +0000 (+0000)
Subject: local.m4, jazz.m4: Move iodine endpoint to jazz.
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/148d527c8a9830cf9587718bac295079db3594d9

local.m4, jazz.m4: Move iodine endpoint to jazz.
---

diff --git a/jazz.m4 b/jazz.m4
index e011a34..96289b1 100644
--- a/jazz.m4
+++ b/jazz.m4
@@ -36,6 +36,7 @@ allowservices inbound udp \
 
 ## Other interesting things.
 dnsresolver inbound
+dnsserver inbound
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------
diff --git a/local.m4 b/local.m4
index 523c11a..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
@@ -98,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
@@ -118,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
@@ -143,6 +143,7 @@ defhost stratocaster
 defhost jazz
 	iface eth0 jump colo
 	iface eth1 jump colo
+	iface dns0 iodine
 
 ## Other networks.
 defnet hub virtual