local.m4: Define the IPv6 network structure.
authorMark Wooding <mdw@distorted.org.uk>
Sun, 11 Mar 2012 05:10:12 +0000 (05:10 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 11 Mar 2012 05:22:39 +0000 (05:22 +0000)
local.m4

index 9d4d917..42ef732 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -47,19 +47,19 @@ m4_divert(26)m4_dnl
 
 ## House networks.
 defnet dmz trusted
-       addr 62.49.204.144/28
+       addr 62.49.204.144/28 2001:470:1f09:1b98::/64
        forwards unsafe untrusted
 defnet unsafe trusted
-       addr 172.29.199.0/25
+       addr 172.29.199.0/25 2001:470:9740:1::/64
        forwards househub
 defnet safe safe
-       addr 172.29.199.192/28
+       addr 172.29.199.192/28 2001:470:9740:4001::/64
        forwards househub
 defnet untrusted untrusted
-       addr 172.29.198.0/25
+       addr 172.29.198.0/25 2001:470:9740:8001::/64
        forwards househub
 defnet vpn safe
-       addr 172.29.199.128/27
+       addr 172.29.199.128/27 2001:ba8:1d9:6000::/64
        forwards househub colohub
        host crybaby 1
        host terror 2
@@ -106,10 +106,10 @@ defhost gibson
 
 ## Colocated networks.
 defnet jump trusted
-       addr 212.13.198.64/28
+       addr 212.13.198.64/28 2001:ba8:0:1d9::/64
        forwards colohub
 defnet colo trusted
-       addr 172.29.199.176/28
+       addr 172.29.199.176/28 2001:ba8:1d9:2::/64
        forwards colohub
 defnet colohub virtual
        forwards colobdry jump colo
@@ -141,8 +141,9 @@ defhost jazz
 defnet hub virtual
        forwards housebdry colobdry
 defnet default untrusted
-       addr 62.49.204.144/28
-       addr 212.13.198.64/28
+       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
 
 m4_divert(80)m4_dnl