Merge http and https rules

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index dccba7c7a8be8c97d52098f7654259a2e26d36fd..831d7ce84d714c74bfd7b23753e207f30fdf1588 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -459,17 +459,7 @@ firewall_rule "accept-http" do
   source "net"
   dest "fw"
   proto "tcp:syn"
   source "net"
   dest "fw"
   proto "tcp:syn"

-  dest_ports "http"
-  rate_limit node[:networking][:firewall][:http_rate_limit]
-  connection_limit node[:networking][:firewall][:http_connection_limit]
-end
-
-firewall_rule "accept-https" do
-  action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "https"
+  dest_ports %w[http https]

   rate_limit node[:networking][:firewall][:http_rate_limit]
   connection_limit node[:networking][:firewall][:http_connection_limit]
 end
   rate_limit node[:networking][:firewall][:http_rate_limit]
   connection_limit node[:networking][:firewall][:http_connection_limit]
 end