Add customised copy of squid_icp munin plugin

[chef.git] / cookbooks / networking / templates / default / shorewall6.conf.erb

diff --git a/cookbooks/networking/templates/default/shorewall6.conf.erb b/cookbooks/networking/templates/default/shorewall6.conf.erb
index 6f31ad6c80f436e8d4a08991d541b3e9828eb0a7..4fc0ffe82db3371e419499a4e7c815470c603934 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall6.conf.erb
+++ b/cookbooks/networking/templates/default/shorewall6.conf.erb
@@ -26,10 +26,6 @@ LOGFORMAT="Shorewall:%s:%s:"
 
 LOGTAGONLY=No
 
 
 LOGTAGONLY=No
 

-LOGRATE=
-
-LOGBURST=
-

 LOGALLNEW=
 
 BLACKLIST_LOGLEVEL=
 LOGALLNEW=
 
 BLACKLIST_LOGLEVEL=


@@ -101,16 +97,12 @@ MUTEX_TIMEOUT=60
 
 ADMINISABSENTMINDED=Yes
 
 
 ADMINISABSENTMINDED=Yes
 

-BLACKLISTNEWONLY=No
-

 MODULE_SUFFIX=ko
 
 FASTACCEPT=No
 
 IMPLICIT_CONTINUE=Yes
 
 MODULE_SUFFIX=ko
 
 FASTACCEPT=No
 
 IMPLICIT_CONTINUE=Yes
 

-HIGH_ROUTE_MARKS=No
-

 OPTIMIZE=1
 
 EXPORTPARAMS=Yes
 OPTIMIZE=1
 
 EXPORTPARAMS=Yes


@@ -129,8 +121,6 @@ MANGLE_ENABLED=Yes
 
 AUTOMAKE=No
 
 
 AUTOMAKE=No
 

-WIDE_TC_MARKS=No
-

 TRACK_PROVIDERS=No
 
 ZONE2ZONE=2
 TRACK_PROVIDERS=No
 
 ZONE2ZONE=2