eggle.m4, local.m4, local.mk: Add new VPS `eggle'.

[firewall] / roadstar.m4

diff --git a/roadstar.m4 b/roadstar.m4
index 0269caa..5d628c9 100644 (file)
--- a/roadstar.m4
+++ b/roadstar.m4
@@ -22,47 +22,26 @@
 ### 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)
-###--------------------------------------------------------------------------
 ### roadstar-specific rules.
 
-m4_divert(84)m4_dnl
+m4_divert(86)m4_dnl
 ## Externally visible services.
 allowservices inbound tcp \
        ssh \
        ident \
-       ftp ftp_data \
+       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