X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/f5a0901ed4205e4675ec69a138b958be512a3211..HEAD:/vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index e016358..f134bb0 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -27,27 +27,14 @@
 m4_divert(86)m4_dnl
 ## Externally visible services.
 allowservices inbound tcp \
-	finger ident \
+	ident \
 	ssh \
-	smtp submission \
-	gnutella_svc \
-	ftp ftp_data \
-	rsync \
-	imaps \
-	disorder mpd \
-	http https squid \
-	git \
 	tor_public tor_directory i2p
 allowservices inbound udp \
 	tripe \
 	gnutella_svc \
 	i2p
 
-## Extend some services to local untrusted hosts.
-clearchain inbound-untrusted
-run iptables -A inbound -j inbound-untrusted -s $net_inet_untrusted
-run ip6tables -A inbound -j inbound-untrusted -s $net_inet6_untrusted
-
 allowservices inbound-untrusted tcp \
 	dns \
 	lpd \
@@ -71,12 +58,8 @@ dnsserver inbound
 ntpclient inbound $ntp_servers
 
 ## Provide NTP service to untrusted clients.
-iptables -A inbound -p udp -j ACCEPT \
-	--source-port 123 --destination-port 123 \
-	-s 172.29.198.0/23
-ip6tables -A inbound -p udp -j ACCEPT \
-	--source-port 123 --destination-port 123 \
-	-s 2001:470:9740::/48
+ip46tables -A inbound-untrusted -p udp -j ACCEPT \
+	--source-port 123 --destination-port 123
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------