From 255ff036c38b27ec48273de293a6e2ba5ba063a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 19 Feb 2016 18:11:43 +0100 Subject: [PATCH] Update firewall_rule resource Updated cookbook --- site-cookbooks/kosmos-base/recipes/default.rb | 2 +- site-cookbooks/kosmos-base/recipes/firewall.rb | 8 +++----- site-cookbooks/kosmos-nginx/recipes/default.rb | 2 +- site-cookbooks/sockethub/recipes/proxy.rb | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb index 7a6064b..fb57d7c 100644 --- a/site-cookbooks/kosmos-base/recipes/default.rb +++ b/site-cookbooks/kosmos-base/recipes/default.rb @@ -9,7 +9,7 @@ include_recipe 'timezone-ii' -node.override['omnibus_updater']['version'] = '12.6.0' +node.override['omnibus_updater']['version'] = '12.7.2' node.override['omnibus_updater']['kill_chef_on_upgrade'] = false include_recipe 'omnibus_updater' diff --git a/site-cookbooks/kosmos-base/recipes/firewall.rb b/site-cookbooks/kosmos-base/recipes/firewall.rb index 92818fd..bbabe75 100644 --- a/site-cookbooks/kosmos-base/recipes/firewall.rb +++ b/site-cookbooks/kosmos-base/recipes/firewall.rb @@ -8,18 +8,16 @@ # # enable default firewall -firewall 'ufw' do - action :enable -end +firewall 'default' firewall_rule 'ssh' do port 22 protocol :tcp - action :allow + command :allow end firewall_rule 'mosh' do port 60000..61000 protocol :udp - action :allow + command :allow end diff --git a/site-cookbooks/kosmos-nginx/recipes/default.rb b/site-cookbooks/kosmos-nginx/recipes/default.rb index 1cac1eb..1e74a57 100644 --- a/site-cookbooks/kosmos-nginx/recipes/default.rb +++ b/site-cookbooks/kosmos-nginx/recipes/default.rb @@ -28,5 +28,5 @@ include_recipe 'nginx' firewall_rule 'http/https' do port [80, 443] protocol :tcp - action :allow + command :allow end diff --git a/site-cookbooks/sockethub/recipes/proxy.rb b/site-cookbooks/sockethub/recipes/proxy.rb index 34faa42..d03aacb 100644 --- a/site-cookbooks/sockethub/recipes/proxy.rb +++ b/site-cookbooks/sockethub/recipes/proxy.rb @@ -10,7 +10,7 @@ firewall_rule 'sockethub' do port node['sockethub']['external_port'].to_i protocol :tcp - action :allow + command :allow end include_recipe 'kosmos-nginx'