From: Micah Anderson <micah@riseup.net>
Date: Wed, 20 Jun 2012 20:00:46 +0000 (-0400)
Subject: fix config path, I think I merged that wrong
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4bb5d70f506fc336a1b03ea74f60506a8af3ccc2;p=puppet-shorewall.git

fix config path, I think I merged that wrong
---

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