Remove roles for fuchur, glaedr, gorwen, idris and lockheed

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

diff --git a/cookbooks/networking/templates/default/shorewall.conf.erb b/cookbooks/networking/templates/default/shorewall.conf.erb
index 8720866d2b0185b6addb644e202f4b08b5980594..290c73fb64fd7e2f1184d5c679b9edf4b9de0eaa 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall.conf.erb
+++ b/cookbooks/networking/templates/default/shorewall.conf.erb
@@ -28,7 +28,11 @@ FIREWALL=
 #                             L O G G I N G
 ###############################################################################
 
 #                             L O G G I N G
 ###############################################################################
 

+<% if node[:networking][:firewall][:log] -%>

 LOG_LEVEL="info"
 LOG_LEVEL="info"

+<% else -%>
+LOG_LEVEL="none"
+<% end -%>

 
 BLACKLIST_LOG_LEVEL=
 
 
 BLACKLIST_LOG_LEVEL=
 


@@ -142,7 +146,11 @@ BALANCE_PROVIDERS=No
 
 BASIC_FILTERS=No
 
 
 BASIC_FILTERS=No
 

+<% if node[:networking][:firewall][:raw] -%>

 BLACKLIST="NEW,INVALID,UNTRACKED"
 BLACKLIST="NEW,INVALID,UNTRACKED"

+<% else -%>
+BLACKLIST="NEW,INVALID"
+<% end -%>

 
 CLAMPMSS=No
 
 
 CLAMPMSS=No
 


@@ -230,7 +238,11 @@ SAVE_ARPTABLES=No
 
 SAVE_IPSETS=No
 
 
 SAVE_IPSETS=No
 

+<% if node[:networking][:firewall][:mangle] -%>

 TC_ENABLED=Internal
 TC_ENABLED=Internal

+<% else -%>
+TC_ENABLED=No
+<% end -%>

 
 TC_EXPERT=No
 
 
 TC_EXPERT=No