Avoid duplicate resource names for wordpress plugins and themes

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

diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb
index 039c12467c7fb86635ddaf8a3475e5aa7309d01d..1e8f3972ce57a68893196267494b347c89125a5f 100644 (file)
--- a/cookbooks/postgresql/resources/database.rb
+++ b/cookbooks/postgresql/resources/database.rb
@@ -17,14 +17,13 @@
 # limitations under the License.
 #
 
+default_action :create
+
 actions :create, :drop
 
 attribute :database, :kind_of => String, :name_attribute => true
 attribute :cluster, :kind_of => String, :required => true
 attribute :owner, :kind_of => String, :required => true
 attribute :encoding, :kind_of => String, :default => "UTF8"
-
-def initialize(*args)
-  super
-  @action = :create
-end
+attribute :collation, :kind_of => String, :default => "en_GB.UTF8"
+attribute :ctype, :kind_of => String, :default => "en_GB.UTF8"