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

diff --git a/vampire.m4 b/vampire.m4
index d25bf49..f21009c 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -1,4 +1,4 @@
-### -*-m4-*-
+### -*-sh-*-
 ###
 ### Firewall configuration for vampire
 ###
@@ -22,16 +22,25 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
+### Config settings.
+
+## This router is involved in a routing asymmetry.
+setconf(rp_filter, 0)
+setconf(log_martians, 0)
+
+###--------------------------------------------------------------------------
 ### Network interfaces.
 
 m4_divert(44)m4_dnl
 ## Interface definitions.
-if_untrusted=eth0.1
-if_trusted=eth0.0
+if_dmz=eth0.0
+if_trusted=eth0.1
+if_safe=$if_dmz,$if_trusted
+if_untrusted=eth0.3
 if_vpn=vpn-+
 if_iodine=dns+
-if_its_mz=eth0.0
-if_its_pi=eth0.0
+if_its_mz=$if_dmz,$if_trusted
+if_its_pi=$if_dmz,$if_trusted
 
 m4_divert(-1)
 ###--------------------------------------------------------------------------
@@ -43,12 +52,13 @@ allowservices inbound tcp \
 	finger ident \
 	dns iodine \
 	ssh \
-	smtp \
+	smtp submission \
 	gnutella_svc \
 	ftp ftp_data \
 	rsync \
+	imaps \
 	disorder mpd \
-	http https \
+	http https squid \
 	git \
 	tor_public tor_directory i2p
 allowservices inbound udp \
@@ -64,23 +74,28 @@ for p in tcp udp; do
 	  -p $p --destination-port $port_dns
 done
 
+## Allow smb and nmb to untrusted hosts.  This is a bit experimental.
+run iptables -A inbound -j ACCEPT \
+	-s 172.29.198.0/24 \
+	-p udp -m multiport --destination-ports \
+		$port_netbios_ns,$port_netbios_dgm
+run iptables -A inbound -j ACCEPT \
+	-s 172.29.198.0/24 \
+	-p tcp -m multiport --destination-ports \
+		$port_netbios_ssn,$port_microsoft_ds
+
 ## Provide syslog for evolution.
 run iptables -A inbound -j ACCEPT \
 	-s 172.29.198.2 \
 	-p udp --destination-port $port_syslog
 
-## Provide a web cache to local untrusted hosts.
-run iptables -A inbound -j ACCEPT \
-	-s 172.29.198.0/24 \
-	-p tcp --destination-port $port_squid
-
 ## Watch outgoing Tor usage.
 run iptables -A OUTPUT -m multiport \
 	-p tcp --source-ports $port_tor_public,$port_tor_directory
 
 ## Other interesting things.
 dnsresolver inbound
-ntpclient inbound 158.152.1.76 158.152.1.204 194.159.253.2
+ntpclient inbound $ntp_servers
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------