X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/a3972fea9c58e172fb2a1c1dc7362ec6a40fa4bd..refs/heads/master:/roadstar.m4

diff --git a/roadstar.m4 b/roadstar.m4
index dd810c2..5d628c9 100644
--- a/roadstar.m4
+++ b/roadstar.m4
@@ -22,40 +22,26 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Config settings.
-
-## This host isn't a router.
-setconf(forward, 0)
-
-###--------------------------------------------------------------------------
-### Network interfaces.
-
-m4_divert(44)m4_dnl
-## Interface definitions.
-if_untrusted=eth0
-if_trusted=eth0
-if_vpn=eth0
-if_iodine=eth0
-if_its_mz=eth0
-if_its_pi=eth0
-
-m4_divert(-1)
-###--------------------------------------------------------------------------
 ### roadstar-specific rules.
 
-m4_divert(82)m4_dnl
+m4_divert(86)m4_dnl
 ## Externally visible services.
 allowservices inbound tcp \
 	ssh \
-	ftp ftp_data \
+	ident \
+	ftp \
 	rsync \
-	http https squid \
-	git
+	http https squid ssquid
+
+allowservices inbound-untrusted tcp \
+	sunrpc mount nfs \
+	lpd
+allowservices inbound-untrusted udp \
+	sunrpc mount nfs
 
 ## Provide DNS resolution to local untrusted hosts.
 for p in tcp udp; do
-  run iptables -A inbound -j ACCEPT \
-	  -s 172.29.198.0/24 \
+  run ip46tables -A inbound-untrusted -j ACCEPT \
 	  -p $p --destination-port $port_dns
 done