Don't expire connection limit sets

[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 c23efa234d0b92ce24260a2a431c5702a827fb4e..8306b046bf3995266916f686153f7eac90285a20 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: munin
+# Cookbook:: munin
 # 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.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,21 +17,23 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 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 :template_source, :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
 
 action :create do
-  template config_file do
+  declare_resource :template, config_file do
     cookbook new_resource.cookbook
-    source new_resource.template_source
+    source new_resource.template
     owner "root"
     group "root"
-    mode 0o644
+    mode "644"
     variables new_resource.variables.merge(:name => new_resource.plugin_conf)
   end
 end