X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/a4d8cae3892c13a32f941ef96b24eaa6930500cb..bf63c594388914a69c14796d36f872d5e0fa4798:/jem.m4

diff --git a/jem.m4 b/jem.m4
index 1f74d59..ecbed74 100644
--- a/jem.m4
+++ b/jem.m4
@@ -22,34 +22,9 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Config settings.
-
-## This host isn't a router.
-setconf(forward, 0)
-
-## This host is involved in a routing asymmetry.
-setconf(rp_filter, 0)
-setconf(log_martians, 0)
-
-###--------------------------------------------------------------------------
-### Network interfaces.
-
-m4_divert(28)m4_dnl
-## Interface definitions.
-if_dmz=eth0
-if_trusted=eth1
-if_safe=$if_dmz,$if_trusted
-if_untrusted=$if_dmz,$if_trusted
-if_vpn=$if_dmz,$if_trusted
-if_iodine=$if_dmz,$if_trusted
-if_its_mz=$if_dmz,$if_trusted
-if_its_pi=$if_dmz,$if_trusted
-
-m4_divert(-1)
-###--------------------------------------------------------------------------
 ### jem-specific rules.
 
-m4_divert(84)m4_dnl
+m4_divert(86)m4_dnl
 ## Set up the SAUCE sinbin.  Unfortunately, ipset is a bit brittle.  This
 ## isn't a completely critical part of the firewall security, so don't make
 ## this fail the entire script.
@@ -61,16 +36,23 @@ iptables -A inbound -g sauce -m set --match-set sauce src || :
 allowservices inbound tcp \
 	ssh \
 	ident \
-	smtp submission \
-	http https \
-	imaps
+	imaps \
+	http https rsync \
+	git
+
+allowservices inbound-untrusted tcp \
+	sunrpc mount nfs
+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 -j ACCEPT \
 	  -p $p --destination-port $port_dns
 done
 
+## Other interesting things.
+dnsresolver inbound
+
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------