Commit cd8d2424 authored by jtimberman's avatar jtimberman
Browse files

Revert "use reload, not restart, per COOK-1189 comment"

This reverts commit 6e6b706b.

Per Mike Fiedler's comment on the COOK-1189 ticket, using "restart" is
the "Right Thing To Do".
parent 4596a02f
...@@ -36,7 +36,7 @@ elsif !node['rsyslog']['server'] ...@@ -36,7 +36,7 @@ elsif !node['rsyslog']['server']
group "root" group "root"
mode 0644 mode 0644
only_if { node['rsyslog']['remote_logs'] && !rsyslog_server.nil? } only_if { node['rsyslog']['remote_logs'] && !rsyslog_server.nil? }
notifies :reload, "service[rsyslog]" notifies :restart, "service[rsyslog]"
end end
file "/etc/rsyslog.d/server.conf" do file "/etc/rsyslog.d/server.conf" do
......
...@@ -58,7 +58,7 @@ template "/etc/rsyslog.conf" do ...@@ -58,7 +58,7 @@ template "/etc/rsyslog.conf" do
group "root" group "root"
mode 0644 mode 0644
variables(:protocol => node['rsyslog']['protocol']) variables(:protocol => node['rsyslog']['protocol'])
notifies :reload, "service[rsyslog]" notifies :restart, "service[rsyslog]"
end end
if platform?("ubuntu") if platform?("ubuntu")
...@@ -68,7 +68,7 @@ if platform?("ubuntu") ...@@ -68,7 +68,7 @@ if platform?("ubuntu")
owner "root" owner "root"
group "root" group "root"
mode 0644 mode 0644
notifies :reload, "service[rsyslog]" notifies :restart, "service[rsyslog]"
end end
end end
......
...@@ -45,7 +45,7 @@ template "/etc/rsyslog.d/35-server-per-host.conf" do ...@@ -45,7 +45,7 @@ template "/etc/rsyslog.d/35-server-per-host.conf" do
owner "root" owner "root"
group "root" group "root"
mode 0644 mode 0644
notifies :reload, "service[rsyslog]" notifies :restart, "service[rsyslog]"
end end
file "/etc/rsyslog.d/remote.conf" do file "/etc/rsyslog.d/remote.conf" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment