From 9bcadd86a1fa03c412b714bd2f75663974d07b83 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 May 2016 14:38:00 +0100 Subject: [PATCH] Create shorewall config files before trying to start it --- cookbooks/networking/recipes/default.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 485f852a6..1774b637b 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -131,12 +131,6 @@ end package "shorewall" -service "shorewall" do - action [:enable, :start] - supports :restart => true - status_command "shorewall status" -end - template "/etc/default/shorewall" do source "shorewall-default.erb" owner "root" @@ -196,6 +190,12 @@ template "/etc/shorewall/rules" do notifies :restart, "service[shorewall]" end +service "shorewall" do + action [:enable, :start] + supports :restart => true + status_command "shorewall status" +end + template "/etc/logrotate.d/shorewall" do source "logrotate.shorewall.erb" owner "root" @@ -244,12 +244,6 @@ end unless node.interfaces(:family => :inet6).empty? package "shorewall6" - service "shorewall6" do - action [:enable, :start] - supports :restart => true - status_command "shorewall6 status" - end - template "/etc/default/shorewall6" do source "shorewall-default.erb" owner "root" @@ -309,6 +303,12 @@ unless node.interfaces(:family => :inet6).empty? notifies :restart, "service[shorewall6]" end + service "shorewall6" do + action [:enable, :start] + supports :restart => true + status_command "shorewall6 status" + end + template "/etc/logrotate.d/shorewall6" do source "logrotate.shorewall.erb" owner "root" -- 2.43.2