Merge pull request #134 from engineyard/FB-1257-collectd-httpd-start

[FB-1257] Start and enable collectd httpd
engineyard · Jan 6, 2020 · a678852 · a678852
2 parents bdac146 + fa12e8e
commit a678852
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/cookbooks/collectd/recipes/httpd.rb b/cookbooks/collectd/recipes/httpd.rb
@@ -48,24 +48,23 @@
   notifies :restart, "service[fcgiwrap]", :delayed
 end
 
+cookbook_file "/etc/systemd/system/collectd-httpd.service" do
+  source 'collectd-httpd.service'
+  owner 'root'
+  group 'root'
+  mode 0644
+  notifies :run, "execute[reload-systemd]", :immediately
+  notifies :restart, "service[collectd-httpd]", :immediately
+end
+
 service 'fcgiwrap.socket' do
   provider Chef::Provider::Service::Systemd
   action :enable
 end
 
 service "collectd-httpd" do
   provider Chef::Provider::Service::Systemd
-  action :nothing
-end
-
-cookbook_file "/etc/systemd/system/collectd-httpd.service" do
-  source 'collectd-httpd.service'
-  owner 'root'
-  group 'root'
-  mode 0644
-  notifies :run, "execute[reload-systemd]", :immediately
-  notifies :enable, "service[collectd-httpd]", :immediately
-  notifies :start, "service[collectd-httpd]", :immediately
+  action [:start, :enable]
 end
 
 package "apache2-utils"