local.m4: Move `vpn' to the common networks section.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:02:03 +0000 (16:02 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:02:03 +0000 (16:02 +0000)
It's not really geographical.

local.m4

index d084db4..5b0360a 100644 (file)
--- 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
 
@@ -142,6 +137,11 @@ defhost jazz
 ## Other networks.
 defnet hub virtual
        forwards housebdry colobdry
+defnet vpn safe
+       addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
+       forwards househub colohub
+       host crybaby 1
+       host terror 2
 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