X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/94ce6e764e92676c1a7dea68820bcf198ea4c466..d359f4f7ab3e4cd36f9a973a996292fe8e5cf94e:/local.m4

diff --git a/local.m4 b/local.m4
index dfaae8f..fc6dae2 100644
--- a/local.m4
+++ b/local.m4
@@ -257,8 +257,8 @@ defnet vpn trusted
 	host terror 2 ::2:1
 	host orange 3 ::3:1
 	host haze 4 ::4:1
-	host groove 5 ::5:1
 	host spirit 9 ::9:1
+	host groove 10 ::10:1
 defnet anycast trusted
 	addr 172.29.199.224/27 2001:ba8:1d9:0::/64
 	via dmz unsafe safe untrusted jump colo vpn
@@ -405,13 +405,13 @@ m4_divert(88)m4_dnl
 openports inbound
 
 ## Inspect inbound packets from untrusted sources.
+run iptables -A inbound -s 172.29.198.0/24 -g inbound-untrusted
 run ip6tables -A inbound -s 2001:8b0:c92:8000::/49 -g inbound-untrusted
 run ip6tables -A inbound -s 2001:ba8:1d9:8000::/49 -g inbound-untrusted
 run ip46tables -A inbound-untrusted -g forbidden
 run ip46tables -A inbound -g forbidden
 run ip46tables -A INPUT -m mark --mark $from_scary/$MASK_FROM -g inbound
 run ip46tables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound
-run iptables -A inbound -s 172.29.198.0/24 -j inbound-untrusted
 
 ## Allow responses from the scary outside world into the untrusted net, but
 ## don't let untrusted things run services.