Merge pull request #395 from legal90/remove-firewall

Remove firewall dependency
sous-chefs · Jan 18, 2017 · 8e56c2f · 8e56c2f
2 parents 36c1f8a + f8fb12d
commit 8e56c2f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/attributes/firewall.rb b/attributes/firewall.rb
diff --git a/metadata.rb b/metadata.rb
@@ -20,7 +20,6 @@
 depends 'build-essential'
 depends 'nssm'
 depends 'golang'
-depends 'firewall', '~> 2.0'
 depends 'poise', '~> 2.2'
 depends 'poise-archive', '~> 1.3'
 depends 'poise-service', '~> 1.4'

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -6,27 +6,6 @@
 #
 node.default['nssm']['install_location'] = '%WINDIR%'
 
-if node['firewall']['allow_consul']
-  include_recipe 'firewall::default'
-
-  # Don't open ports that we've disabled
-  ports = node['consul']['config']['ports'].select { |_name, port| port != -1 }
-
-  firewall_rule 'consul' do
-    protocol :tcp
-    port ports.values
-    action :create
-    command :allow
-  end
-
-  firewall_rule 'consul-udp' do
-    protocol :udp
-    port ports.values_at('serf_lan', 'serf_wan', 'dns')
-    action :create
-    command :allow
-  end
-end
-
 service_name = node['consul']['service_name']
 poise_service_user node['consul']['service_user'] do
   group node['consul']['service_group']