From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 27 Jun 2016 09:54:17 +0000 (+0100)
Subject: local.m4: Prepare for switchover to A&A.
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/f01cdc79f93706687fab5a412f0f5b504e5f4431

local.m4: Prepare for switchover to A&A.
---

diff --git a/local.m4 b/local.m4
index 074bf16..b0a4e4c 100644
--- a/local.m4
+++ b/local.m4
@@ -43,6 +43,10 @@ m4_divert(-1)
 ##		House border network (dmz).  We have all of these, but .145
 ##		is reserved for the router.
 ##
+## 81.2.113.195, 81.187.238.128/28
+##		House border network (aaisp).  We have all of these; the
+##		loose address is for the router.
+##
 ## 212.13.18.64/28
 ##		Jump colocated network (jump).  .65--68 are used by Jump
 ##		network infrastructure; we get the rest.
@@ -79,6 +83,10 @@ m4_divert(-1)
 ## 2001:470:9740::/48
 ##		Main house range.  See below for allocation policy.
 ##
+## 2001:8b0:c92::/48
+##		Main house range (aaisp).  See below for allocation policy.
+##		There is no explicit DMZ allocation (and no need for one).
+##
 ## 2001:ba8:0:1d9::/64
 ##		Jump border network (jump): :1 is the router (supplied by
 ##		Jump); other addresses are ours.
@@ -131,6 +139,7 @@ m4_divert(26)m4_dnl
 ## House networks.
 defnet dmz trusted
 	addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+	addr 81.2.113.195 81.187.238.128/28 2001:8b0:c92::/48
 	via unsafe untrusted
 defnet unsafe trusted
 	addr 172.29.199.0/25 2001:470:9740:1::/64