blog: remove opengeodata.org ssl cleanup

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

diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb
index 6295955cc6928cdbb86572de0d141e82bfbb0a41..4f7217ec850a82fe81f08d16083412f0b45a1406 100644 (file)
--- a/cookbooks/postgresql/resources/execute.rb
+++ b/cookbooks/postgresql/resources/execute.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: postgresql
+# Cookbook:: postgresql
 # 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.
 # 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,16 +17,15 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 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 :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 }