Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  local.m4: Put the default network stanza at the end.
  local.m4: Note terror's participation in the VPN.

diff --git a/local.m4 b/local.m4
index b321cde9f86d341fda8be5f657ef4823d52e6a32..0d38497b391b48392c8cf1c02245830f6db1c0dc 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -38,17 +38,18 @@ m4_divert(-1)m4_dnl
 m4_divert(46)m4_dnl
 ## Networks and routing.
 
-defiface $if_trusted \
-       trusted:172.29.199.0/26 \
-       safe:172.29.199.64/27 \
-       untrusted:default
 defiface $if_untrusted \
        untrusted:172.29.198.0/25
 defvpn $if_vpn safe 172.29.199.128/27 \
-       crybaby:172.29.199.129
+       crybaby:172.29.199.129 \
+       terror:172.29.199.130
 defiface $if_iodine untrusted:172.29.198.128/28
 defiface $if_its_mz safe:172.29.199.160/30
 defiface $if_its_pi safe:192.168.0.0/24
+defiface $if_trusted \
+       trusted:172.29.199.0/26 \
+       safe:172.29.199.64/27 \
+       untrusted:default
 
 m4_divert(60)m4_dnl
 ###--------------------------------------------------------------------------