Use default sandboxing for API statistics and rails job runners

[chef.git] / cookbooks / munin / recipes / plugins.rb

diff --git a/cookbooks/munin/recipes/plugins.rb b/cookbooks/munin/recipes/plugins.rb
index 7a2ebd60dc96a9432c6f2cc15d1a2b3f225a23d3..f9d22c9eb8593f0524392544aeb8e1069635ff47 100644 (file)
--- a/cookbooks/munin/recipes/plugins.rb
+++ b/cookbooks/munin/recipes/plugins.rb
@@ -26,7 +26,7 @@ remote_directory "/usr/local/share/munin/plugins" do
   mode "755"
   files_owner "root"
   files_group "root"
   mode "755"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

   purge true
 end
 
   purge true
 end
 


@@ -37,7 +37,7 @@ remote_directory "/etc/munin/plugin-conf.d" do
   mode "750"
   files_owner "root"
   files_group "root"
   mode "750"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

   purge false
   notifies :restart, "service[munin-node]"
 end
   purge false
   notifies :restart, "service[munin-node]"
 end


@@ -205,33 +205,20 @@ munin_plugin "load"
 munin_plugin "memory"
 munin_plugin "netstat"
 
 munin_plugin "memory"
 munin_plugin "netstat"
 

-if node[:kernel][:modules].include?("nfsv3")
-  munin_plugin "nfs_client"
-else
-  munin_plugin "nfs_client" do
-    action :delete
-  end
+munin_plugin "nfs_client" do
+  action :delete

 end
 
 end
 

-if node[:kernel][:modules].include?("nfsv4")
-  munin_plugin "nfs4_client"
-else
-  munin_plugin "nfs4_client" do
-    action :delete
-  end
+munin_plugin "nfs4_client" do
+  action :delete

 end
 
 end
 

-if node[:kernel][:modules].include?("nfsd")
-  munin_plugin "nfsd"
-  munin_plugin "nfsd4"
-else
-  munin_plugin "nfsd" do
-    action :delete
-  end
+munin_plugin "nfsd" do
+  action :delete
+end

 
 

-  munin_plugin "nfsd4" do
-    action :delete
-  end
+munin_plugin "nfsd4" do
+  action :delete

 end
 
 munin_plugin "open_files"
 end
 
 munin_plugin "open_files"