X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/93088ecf5f09c8d7383fccd4aa06fcf44cb4691a..21958591555b0b80370e944e3128ac5d533c281d:/cookbooks/wordpress/definitions/wordpress_site.rb

diff --git a/cookbooks/wordpress/definitions/wordpress_site.rb b/cookbooks/wordpress/definitions/wordpress_site.rb
index 1a3fa2423..08aac28a3 100644
--- a/cookbooks/wordpress/definitions/wordpress_site.rb
+++ b/cookbooks/wordpress/definitions/wordpress_site.rb
@@ -17,9 +17,10 @@
 # limitations under the License.
 #
 
-define :wordpress_site, :action => [ :create, :enable ] do
+define :wordpress_site, :action => [:create, :enable] do
   name = params[:name]
   ssl_enabled = params[:ssl_enabled] || false
+  ssl_certificate = params[:ssl_certificate]
   aliases = Array(params[:aliases])
   urls = Array(params[:urls])
   directory = params[:directory] || "/srv/#{name}"
@@ -110,15 +111,11 @@ define :wordpress_site, :action => [ :create, :enable ] do
   end
 
   file "#{directory}/sitemap.xml" do
-    owner "www-data"
-    group "www-data"
-    mode 0644
+    action :delete
   end
 
   file "#{directory}/sitemap.xml.gz" do
-    owner "www-data"
-    group "www-data"
-    mode 0644
+    action :delete
   end
 
   cookbook_file "#{directory}/googlefac54c35e800caab.html" do
@@ -133,7 +130,8 @@ define :wordpress_site, :action => [ :create, :enable ] do
     cookbook "wordpress"
     template "apache.erb"
     directory directory
-    variables :aliases => aliases, :urls => urls, :ssl_enabled => ssl_enabled
+    variables :aliases => aliases, :urls => urls,
+              :ssl_enabled => ssl_enabled, :ssl_certificate => ssl_certificate
     notifies :reload, "service[apache2]"
   end