X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/blobdiff_plain/beb4f0eeafb386d83f2593fec489f4291583e08b..d0409c909cb113596f5d0daed5be237a42878c8d:/jem.m4

diff --git a/jem.m4 b/jem.m4
index afb8068..4a9f9c6 100644
--- a/jem.m4
+++ b/jem.m4
@@ -21,20 +21,10 @@
 ### along with this program; if not, write to the Free Software Foundation,
 ### 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)
-
 ###--------------------------------------------------------------------------
 ### 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.
@@ -46,9 +36,9 @@ 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
 
 ## Provide DNS resolution to local untrusted hosts.
 for p in tcp udp; do
@@ -57,5 +47,8 @@ for p in tcp udp; do
 	  -p $p --destination-port $port_dns
 done
 
+## Other interesting things.
+dnsresolver inbound
+
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------