X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/56fcbc5d4f195f3973c08a2155037ec9103c1c01..5fef39842bb8b48f83422b60e8baacc63106ee24:/cookbooks/wordpress/resources/site.rb

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 99b506fd4..1771c2a1b 100644
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -25,8 +25,8 @@ property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :version, :kind_of => String
 property :database_name, :kind_of => String, :required => true
-property :database_user, :kind_of => String, :required => true
-property :database_password, :kind_of => String, :required => true
+property :database_user, :kind_of => String, :required => [:create]
+property :database_password, :kind_of => String, :required => [:create]
 property :database_prefix, :kind_of => String, :default => "wp_"
 property :urls, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
@@ -34,8 +34,6 @@ property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 action :create do
   version = new_resource.version || Chef::Wordpress.current_version
 
-  node.rm_normal(:wordpress, :sites, new_resource.site)
-
   node.default[:wordpress][:sites][new_resource.site] = {
     :directory => site_directory
   }