From 33350d4b8799e586fa6567806faac984b69745ba Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 23 Dec 2011 00:16:27 +0100
Subject: add squeeze config file

---
 files/shorewall.conf.Debian.squeeze | 217 ++++++++++++++++++++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 files/shorewall.conf.Debian.squeeze

(limited to 'files/shorewall.conf.Debian.squeeze')

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
new file mode 100644
index 0000000..724287d
--- /dev/null
+++ b/files/shorewall.conf.Debian.squeeze
@@ -0,0 +1,217 @@
+####
+#### Managed by puppet, modify only on the puppetmaster
+###
+###############################################################################
+#
+#  Shorewall Version 4 -- /etc/shorewall/shorewall.conf
+#
+#  For information about the settings in this file, type "man shorewall.conf"
+#
+#  Manpage also online at http://www.shorewall.net/manpages/shorewall.conf.html
+###############################################################################
+#		       S T A R T U P   E N A B L E D
+###############################################################################
+
+STARTUP_ENABLED=Yes
+
+###############################################################################
+#		              V E R B O S I T Y
+###############################################################################
+
+VERBOSITY=1
+
+###############################################################################
+#		                L O G G I N G
+###############################################################################
+
+BLACKLIST_LOGLEVEL=
+
+LOG_MARTIANS=No
+
+LOG_VERBOSITY=2
+
+LOGALLNEW=
+
+LOGFILE=/var/log/messages
+
+LOGFORMAT="Shorewall:%s:%s:"
+
+LOGTAGONLY=No
+
+LOGLIMIT=
+
+MACLIST_LOG_LEVEL=info
+
+SFILTER_LOG_LEVEL=info
+
+SMURF_LOG_LEVEL=info
+
+STARTUP_LOG=/var/log/shorewall-init.log
+
+TCP_FLAGS_LOG_LEVEL=info
+
+###############################################################################
+#	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=
+
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin"
+
+PERL=/usr/bin/perl
+
+RESTOREFILE=restore
+
+SHOREWALL_SHELL=/bin/sh
+
+SUBSYSLOCK=/var/lock/subsys/shorewall
+
+TC=
+
+###############################################################################
+#		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
+
+###############################################################################
+#                        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}'
+
+###############################################################################
+#			F I R E W A L L	  O P T I O N S
+###############################################################################
+
+ACCOUNTING=Yes
+
+ACCOUNTING_TABLE=filter
+
+ADD_IP_ALIASES=No
+
+ADD_SNAT_ALIASES=No
+
+ADMINISABSENTMINDED=Yes
+
+AUTO_COMMENT=Yes
+
+AUTOMAKE=No
+
+BLACKLISTNEWONLY=Yes
+
+CLAMPMSS=No
+
+CLEAR_TC=Yes
+
+COMPLETE=No
+
+DELETE_THEN_ADD=Yes
+
+DETECT_DNAT_IPADDRS=YES
+
+DISABLE_IPV6=Yes
+
+DONT_LOAD=
+
+DYNAMIC_BLACKLIST=Yes
+
+EXPAND_POLICIES=Yes
+
+EXPORTMODULES=Yes
+
+FASTACCEPT=No
+
+FORWARD_CLEAR_MARK=
+
+IMPLICIT_CONTINUE=Yes
+
+HIGH_ROUTE_MARKS=No
+
+IP_FORWARDING=On
+
+KEEP_RT_TABLES=No
+
+LEGACY_FASTSTART=Yes
+
+LOAD_HELPERS_ONLY=No
+
+MACLIST_TABLE=mangle
+
+MACLIST_TTL=
+
+MANGLE_ENABLED=Yes
+
+MAPOLDACTIONS=No
+
+MARK_IN_FORWARD_CHAIN=Yes
+
+MODULE_SUFFIX=ko
+
+MULTICAST=No
+
+MUTEX_TIMEOUT=60
+
+NULL_ROUTE_RFC1918=No
+
+OPTIMIZE=0
+
+OPTIMIZE_ACCOUNTING=No
+
+REQUIRE_INTERFACE=No
+
+RESTORE_DEFAULT_ROUTE=Yes
+
+RETAIN_ALIASES=No
+
+ROUTE_FILTER=No
+
+SAVE_IPSETS=No
+
+TC_ENABLED=Internal
+
+TC_EXPERT=No
+
+TC_PRIOMAP="2 3 3 3 2 3 1 1 2 2 2 2 2 2 2 2"
+
+TRACK_PROVIDERS=No
+
+USE_DEFAULT_RT=No
+
+WIDE_TC_MARKS=No
+
+ZONE2ZONE=2
+
+###############################################################################
+#			P A C K E T   D I S P O S I T I O N
+###############################################################################
+
+BLACKLIST_DISPOSITION=DROP
+
+MACLIST_DISPOSITION=DROP
+
+SMURF_DISPOSITION=DROP
+
+SFILTER_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
+################################################################################
+
+IPSECFILE=zones
-- 
cgit v1.2.3


From b9f1b40cce8d265a799a23f07af3eea701393898 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 23 Dec 2011 11:05:14 +0100
Subject: remove a couple of not yet supported options

---
 files/shorewall.conf.Debian.squeeze | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'files/shorewall.conf.Debian.squeeze')

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index 724287d..f04e947 100644
--- a/files/shorewall.conf.Debian.squeeze
+++ b/files/shorewall.conf.Debian.squeeze
@@ -38,12 +38,8 @@ LOGFORMAT="Shorewall:%s:%s:"
 
 LOGTAGONLY=No
 
-LOGLIMIT=
-
 MACLIST_LOG_LEVEL=info
 
-SFILTER_LOG_LEVEL=info
-
 SMURF_LOG_LEVEL=info
 
 STARTUP_LOG=/var/log/shorewall-init.log
@@ -99,8 +95,6 @@ RSH_COMMAND='ssh ${root}@${system} ${command}'
 
 ACCOUNTING=Yes
 
-ACCOUNTING_TABLE=filter
-
 ADD_IP_ALIASES=No
 
 ADD_SNAT_ALIASES=No
@@ -117,8 +111,6 @@ CLAMPMSS=No
 
 CLEAR_TC=Yes
 
-COMPLETE=No
-
 DELETE_THEN_ADD=Yes
 
 DETECT_DNAT_IPADDRS=YES
@@ -131,8 +123,6 @@ DYNAMIC_BLACKLIST=Yes
 
 EXPAND_POLICIES=Yes
 
-EXPORTMODULES=Yes
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=
@@ -145,8 +135,6 @@ IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
 
-LEGACY_FASTSTART=Yes
-
 LOAD_HELPERS_ONLY=No
 
 MACLIST_TABLE=mangle
@@ -203,10 +191,6 @@ BLACKLIST_DISPOSITION=DROP
 
 MACLIST_DISPOSITION=DROP
 
-SMURF_DISPOSITION=DROP
-
-SFILTER_DISPOSITION=DROP
-
 TCP_FLAGS_DISPOSITION=DROP
 
 ################################################################################
-- 
cgit v1.2.3


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(-)

(limited to 'files/shorewall.conf.Debian.squeeze')

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


From 475d93888ff853d48b6f4cdcc894415026553abe Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 20 Jun 2012 13:39:20 -0400
Subject: fixup some merge gaffs

---
 files/shorewall.conf.Debian.squeeze | 3 +--
 manifests/init.pp                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'files/shorewall.conf.Debian.squeeze')

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index 5c57b04..a3b1577 100644
--- a/files/shorewall.conf.Debian.squeeze
+++ b/files/shorewall.conf.Debian.squeeze
@@ -121,7 +121,7 @@ CLAMPMSS=No
 ROUTE_FILTER=Yes
 
 DETECT_DNAT_IPADDRS=No
-=======
+
 MARK_IN_FORWARD_CHAIN=Yes
 
 CLAMPMSS=No
@@ -129,7 +129,6 @@ CLAMPMSS=No
 ROUTE_FILTER=No
 
 DETECT_DNAT_IPADDRS=YES
->>>>>>> immerda/master
 
 MUTEX_TIMEOUT=60
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 574ac85..656f5a1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,7 +16,7 @@ class shorewall(
       }
     }
     default: {
-      notice "unknown operatingsystem: $operatingsystem" 
+      notice "unknown operatingsystem: ${::operatingsystem}" 
       include shorewall::base
     }
   }
-- 
cgit v1.2.3


From 4bb5d70f506fc336a1b03ea74f60506a8af3ccc2 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 20 Jun 2012 16:00:46 -0400
Subject: fix config path, I think I merged that wrong

---
 files/shorewall.conf.Debian.squeeze | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'files/shorewall.conf.Debian.squeeze')

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index a3b1577..da8e29e 100644
--- a/files/shorewall.conf.Debian.squeeze
+++ b/files/shorewall.conf.Debian.squeeze
@@ -1,3 +1,7 @@
+####
+#### Managed by puppet, modify only on the puppetmaster
+####
+
 ###############################################################################
 #
 #  Shorewall Version 4 -- /etc/shorewall/shorewall.conf
@@ -18,7 +22,7 @@ STARTUP_ENABLED=Yes
 VERBOSITY=1
 
 ###############################################################################
-#		                L O G G I N G
+#			       L O G G I N G
 ###############################################################################
 
 LOGFILE=/var/log/messages
@@ -122,14 +126,6 @@ ROUTE_FILTER=Yes
 
 DETECT_DNAT_IPADDRS=No
 
-MARK_IN_FORWARD_CHAIN=Yes
-
-CLAMPMSS=No
-
-ROUTE_FILTER=No
-
-DETECT_DNAT_IPADDRS=YES
-
 MUTEX_TIMEOUT=60
 
 ADMINISABSENTMINDED=Yes
-- 
cgit v1.2.3


From 5052233d92e97263eab292408ed2602db0836d98 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 20 Jun 2012 16:17:37 -0400
Subject: put config file back to immerda version

---
 files/shorewall.conf.Debian.squeeze | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'files/shorewall.conf.Debian.squeeze')

diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze
index da8e29e..63b7350 100644
--- a/files/shorewall.conf.Debian.squeeze
+++ b/files/shorewall.conf.Debian.squeeze
@@ -1,7 +1,6 @@
 ####
 #### Managed by puppet, modify only on the puppetmaster
-####
-
+###
 ###############################################################################
 #
 #  Shorewall Version 4 -- /etc/shorewall/shorewall.conf
@@ -22,7 +21,7 @@ STARTUP_ENABLED=Yes
 VERBOSITY=1
 
 ###############################################################################
-#			       L O G G I N G
+#		                L O G G I N G
 ###############################################################################
 
 LOGFILE=/var/log/messages
@@ -49,7 +48,7 @@ TCP_FLAGS_LOG_LEVEL=info
 
 SMURF_LOG_LEVEL=info
 
-LOG_MARTIANS=Yes
+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
@@ -102,7 +101,7 @@ RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
 #			F I R E W A L L	  O P T I O N S
 ###############################################################################
 
-IP_FORWARDING=Keep
+IP_FORWARDING=On
 
 ADD_IP_ALIASES=No
 
@@ -118,13 +117,13 @@ TC_PRIOMAP="2 3 3 3 2 3 1 1 2 2 2 2 2 2 2 2"
 
 CLEAR_TC=Yes
 
-MARK_IN_FORWARD_CHAIN=No
+MARK_IN_FORWARD_CHAIN=Yes
 
 CLAMPMSS=No
 
-ROUTE_FILTER=Yes
+ROUTE_FILTER=No
 
-DETECT_DNAT_IPADDRS=No
+DETECT_DNAT_IPADDRS=YES
 
 MUTEX_TIMEOUT=60
 
@@ -136,7 +135,7 @@ DELAYBLACKLISTLOAD=No
 
 MODULE_SUFFIX=ko
 
-DISABLE_IPV6=No
+DISABLE_IPV6=Yes
 
 BRIDGING=No
 
@@ -146,7 +145,7 @@ PKTTYPE=Yes
 
 NULL_ROUTE_RFC1918=No
 
-MACLIST_TABLE=filter
+MACLIST_TABLE=mangle
 
 MACLIST_TTL=
 
@@ -156,7 +155,7 @@ MAPOLDACTIONS=No
 
 FASTACCEPT=No
 
-IMPLICIT_CONTINUE=No
+IMPLICIT_CONTINUE=Yes
 
 HIGH_ROUTE_MARKS=No
 
@@ -210,8 +209,9 @@ FORWARD_CLEAR_MARK=Yes
 
 BLACKLIST_DISPOSITION=DROP
 
-MACLIST_DISPOSITION=REJECT
+MACLIST_DISPOSITION=DROP
 
 TCP_FLAGS_DISPOSITION=DROP
 
 #LAST LINE -- DO NOT REMOVE
+
-- 
cgit v1.2.3