Replace custom query with process_idle collector

[chef.git] / cookbooks / postgresql / resources / execute.rb

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 75abddfffd5bbd25b68ad51fe27ca43276acc713..4f7217ec850a82fe81f08d16083412f0b45a1406 100644 (file)
--- a/cookbooks/postgresql/resources/execute.rb
+++ b/cookbooks/postgresql/resources/execute.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: postgresql
+# Cookbook:: postgresql

 # Resource:: postgresql_execute
 #
 # Resource:: postgresql_execute
 #

-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, 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,16 +17,15 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :run
 
 default_action :run
 

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

 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true
 property :cluster, :kind_of => String, :required => true
 property :database, :kind_of => String, :required => true

-property :user, :default => "postgres"
-property :group, :default => "postgres"
-
-action :nothing do
-end
+property :user, :kind_of => String, :default => "postgres"
+property :group, :kind_of => String, :default => "postgres"

 
 action :run do
   options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group }
 
 action :run do
   options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group }