From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 11 Mar 2012 05:23:50 +0000 (+0000)
Subject: Merge branch 'master' into emergency
X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/commitdiff_plain/c8dab9d26762658a6ba0b34c5598b589ae2652d3

Merge branch 'master' into emergency

* master:
  local.m4: Fix the `safe' network prefix length.
  local.m4: Define the IPv6 network structure.
  local.m4: Add routes to/from the `safe' network.
  local.m4: The VPN will be available through the colo.
  functions.m4: Correct defaulting of IPv6 host addresses.

Conflicts:
	local.m4
---

c8dab9d26762658a6ba0b34c5598b589ae2652d3
diff --cc local.m4
index 8f39161,f139f00..4385223
--- a/local.m4
+++ b/local.m4
@@@ -90,9 -90,10 +90,10 @@@ defhost artis
  	iface eth1 dmz unsafe
  defhost vampire
  	router
- 	iface eth0.0 dmz unsafe default
- 	iface eth0.1 dmz unsafe default
 -	iface eth0.0 dmz unsafe safe
 -	iface eth0.1 dmz unsafe safe
++	iface eth0.0 dmz unsafe safe default
++	iface eth0.1 dmz unsafe safe default
+ 	iface eth0.2 safe
 -	iface eth0.3 untrusted
 +	iface eth0.3 untrusted default
  	iface dns0 dns
  	iface vpn-+ vpn
  	iface vpn-precision colobdry vpn