From c2f5b75eb81faf1a7ee364ce3b6e35de16e59a8e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 23 Dec 2011 11:59:06 +0100
Subject: correct config file for squeeze

---
 files/shorewall.conf.Debian.squeeze | 150 ++++++++++++++++++++----------------
 1 file changed, 83 insertions(+), 67 deletions(-)

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index f04e947..63b7350 100644
--- a/files/shorewall.conf.Debian.squeeze
+++ b/files/shorewall.conf.Debian.squeeze
@@ -24,165 +24,185 @@ VERBOSITY=1
 #		                L O G G I N G
 ###############################################################################
 
-BLACKLIST_LOGLEVEL=
+LOGFILE=/var/log/messages
 
-LOG_MARTIANS=No
+STARTUP_LOG=/var/log/shorewall-init.log
 
 LOG_VERBOSITY=2
 
-LOGALLNEW=
-
-LOGFILE=/var/log/messages
-
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGTAGONLY=No
 
-MACLIST_LOG_LEVEL=info
+LOGRATE=
 
-SMURF_LOG_LEVEL=info
+LOGBURST=
 
-STARTUP_LOG=/var/log/shorewall-init.log
+LOGALLNEW=
+
+BLACKLIST_LOGLEVEL=
+
+MACLIST_LOG_LEVEL=info
 
 TCP_FLAGS_LOG_LEVEL=info
 
+SMURF_LOG_LEVEL=info
+
+LOG_MARTIANS=No
+
 ###############################################################################
 #	L O C A T I O N	  O F	F I L E S   A N D   D I R E C T O R I E S
 ###############################################################################
 
-CONFIG_PATH="/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"
-
 IPTABLES=
 
 IP=
 
-IPSET=
-
-MODULESDIR=
+TC=
 
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin"
+IPSET=
 
 PERL=/usr/bin/perl
 
-RESTOREFILE=restore
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 
 SHOREWALL_SHELL=/bin/sh
 
-SUBSYSLOCK=/var/lock/subsys/shorewall
+SUBSYSLOCK=""
 
-TC=
+MODULESDIR=
+
+CONFIG_PATH="/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"
+
+RESTOREFILE=
+
+IPSECFILE=zones
+
+LOCKFILE=
 
 ###############################################################################
 #		D E F A U L T   A C T I O N S / M A C R O S
 ###############################################################################
 
-ACCEPT_DEFAULT=none
-DROP_DEFAULT=Drop
-NFQUEUE_DEFAULT=none
-QUEUE_DEFAULT=none
-REJECT_DEFAULT=Reject
+DROP_DEFAULT="Drop"
+REJECT_DEFAULT="Reject"
+ACCEPT_DEFAULT="none"
+QUEUE_DEFAULT="none"
+NFQUEUE_DEFAULT="none"
 
 ###############################################################################
 #                        R S H / R C P  C O M M A N D S
 ###############################################################################
 
-RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
 RSH_COMMAND='ssh ${root}@${system} ${command}'
+RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
 
 ###############################################################################
 #			F I R E W A L L	  O P T I O N S
 ###############################################################################
 
-ACCOUNTING=Yes
+IP_FORWARDING=On
 
 ADD_IP_ALIASES=No
 
 ADD_SNAT_ALIASES=No
 
-ADMINISABSENTMINDED=Yes
-
-AUTO_COMMENT=Yes
+RETAIN_ALIASES=No
 
-AUTOMAKE=No
+TC_ENABLED=Internal
 
-BLACKLISTNEWONLY=Yes
+TC_EXPERT=No
 
-CLAMPMSS=No
+TC_PRIOMAP="2 3 3 3 2 3 1 1 2 2 2 2 2 2 2 2"
 
 CLEAR_TC=Yes
 
-DELETE_THEN_ADD=Yes
+MARK_IN_FORWARD_CHAIN=Yes
 
-DETECT_DNAT_IPADDRS=YES
+CLAMPMSS=No
 
-DISABLE_IPV6=Yes
+ROUTE_FILTER=No
 
-DONT_LOAD=
+DETECT_DNAT_IPADDRS=YES
 
-DYNAMIC_BLACKLIST=Yes
+MUTEX_TIMEOUT=60
 
-EXPAND_POLICIES=Yes
+ADMINISABSENTMINDED=Yes
 
-FASTACCEPT=No
+BLACKLISTNEWONLY=Yes
 
-FORWARD_CLEAR_MARK=
+DELAYBLACKLISTLOAD=No
 
-IMPLICIT_CONTINUE=Yes
+MODULE_SUFFIX=ko
 
-HIGH_ROUTE_MARKS=No
+DISABLE_IPV6=Yes
 
-IP_FORWARDING=On
+BRIDGING=No
 
-KEEP_RT_TABLES=No
+DYNAMIC_ZONES=No
 
-LOAD_HELPERS_ONLY=No
+PKTTYPE=Yes
+
+NULL_ROUTE_RFC1918=No
 
 MACLIST_TABLE=mangle
 
 MACLIST_TTL=
 
-MANGLE_ENABLED=Yes
+SAVE_IPSETS=No
 
 MAPOLDACTIONS=No
 
-MARK_IN_FORWARD_CHAIN=Yes
+FASTACCEPT=No
 
-MODULE_SUFFIX=ko
+IMPLICIT_CONTINUE=Yes
 
-MULTICAST=No
+HIGH_ROUTE_MARKS=No
 
-MUTEX_TIMEOUT=60
-
-NULL_ROUTE_RFC1918=No
+USE_ACTIONS=Yes
 
 OPTIMIZE=0
 
-OPTIMIZE_ACCOUNTING=No
+EXPORTPARAMS=Yes
 
-REQUIRE_INTERFACE=No
+EXPAND_POLICIES=Yes
 
-RESTORE_DEFAULT_ROUTE=Yes
+KEEP_RT_TABLES=No
 
-RETAIN_ALIASES=No
+DELETE_THEN_ADD=Yes
 
-ROUTE_FILTER=No
+MULTICAST=No
 
-SAVE_IPSETS=No
+DONT_LOAD=
 
-TC_ENABLED=Internal
+AUTO_COMMENT=Yes
 
-TC_EXPERT=No
+MANGLE_ENABLED=Yes
 
-TC_PRIOMAP="2 3 3 3 2 3 1 1 2 2 2 2 2 2 2 2"
+USE_DEFAULT_RT=No
 
-TRACK_PROVIDERS=No
+RESTORE_DEFAULT_ROUTE=Yes
 
-USE_DEFAULT_RT=No
+AUTOMAKE=No
 
 WIDE_TC_MARKS=No
 
+TRACK_PROVIDERS=No
+
 ZONE2ZONE=2
 
+ACCOUNTING=Yes
+
+DYNAMIC_BLACKLIST=Yes
+
+OPTIMIZE_ACCOUNTING=No
+
+LOAD_HELPERS_ONLY=No
+
+REQUIRE_INTERFACE=No
+
+FORWARD_CLEAR_MARK=Yes
+
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
 ###############################################################################
@@ -193,9 +213,5 @@ MACLIST_DISPOSITION=DROP
 
 TCP_FLAGS_DISPOSITION=DROP
 
-################################################################################
-#                            L E G A C Y  O P T I O N
-#                      D O  N O T  D E L E T E  O R  A L T E R
-################################################################################
+#LAST LINE -- DO NOT REMOVE
 
-IPSECFILE=zones
-- 
cgit v1.2.3