nominatim: switch stormfly back to php frontend

[chef.git] / cookbooks / munin / resources / plugin_conf.rb

diff --git a/cookbooks/munin/resources/plugin_conf.rb b/cookbooks/munin/resources/plugin_conf.rb
index 63d6f4c57846b587cc8b9a0708f9620ecab243be..8306b046bf3995266916f686153f7eac90285a20 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: munin
+# Cookbook:: munin

 # Resource:: munin_plugin_conf
 #
 # Resource:: munin_plugin_conf
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,11 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :plugin_conf, :kind_of => String, :name_attribute => true
+property :plugin_conf, :kind_of => String, :name_property => true

 property :cookbook, :kind_of => [String, nil]
 property :cookbook, :kind_of => [String, nil]

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :restart_munin, :kind_of => [TrueClass, FalseClass], :default => true
 
 property :variables, :kind_of => Hash, :default => {}
 property :restart_munin, :kind_of => [TrueClass, FalseClass], :default => true
 


@@ -31,7 +33,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
     source new_resource.template
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables new_resource.variables.merge(:name => new_resource.plugin_conf)
   end
 end
     variables new_resource.variables.merge(:name => new_resource.plugin_conf)
   end
 end