From: Mark Wooding Date: Mon, 17 Jan 2011 15:30:06 +0000 (+0000) Subject: Merge branch 'master' of /home/mdw/public-git/firewall X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/6f0a7bc1a8dec07b7768a1b6d8f592190c7e63d4?hp=2ee3987faf2592f75b0af917e8771d23de5286b7 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 b321cde..0d38497 100644 --- 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 ###--------------------------------------------------------------------------