WP plugin XML Sitemap Generator now internally handles sitemap.xml

[chef.git] / cookbooks / wordpress / definitions / wordpress_site.rb

diff --git a/cookbooks/wordpress/definitions/wordpress_site.rb b/cookbooks/wordpress/definitions/wordpress_site.rb
index fcdf6948530d9ec8a8e9fe2c23898f2f1b26e541..8211f4cd0844a7e83e7c240eed2a9d15709729d6 100644 (file)
--- a/cookbooks/wordpress/definitions/wordpress_site.rb
+++ b/cookbooks/wordpress/definitions/wordpress_site.rb
@@ -19,6 +19,7 @@
 
 define :wordpress_site, :action => [ :create, :enable ] do
   name = params[:name]
+  ssl_enabled = params[:ssl_enabled] || false
   aliases = Array(params[:aliases])
   urls = Array(params[:urls])
   directory = params[:directory] || "/srv/#{name}"
@@ -85,6 +86,10 @@ define :wordpress_site, :action => [ :create, :enable ] do
       line += " * Don't allow file editing.\n"
       line += " */\n"
       line += "define('DISALLOW_FILE_EDIT', true);\n"
+      if ssl_enabled
+        line += "define('FORCE_SSL_LOGIN', true);\n"
+        line += "define('FORCE_SSL_ADMIN', true);\n"
+      end
     end
 
     line
@@ -105,15 +110,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
@@ -128,7 +129,7 @@ define :wordpress_site, :action => [ :create, :enable ] do
     cookbook "wordpress"
     template "apache.erb"
     directory directory
-    variables :aliases => aliases, :urls => urls
+    variables :aliases => aliases, :urls => urls, :ssl_enabled => ssl_enabled
     notifies :reload, "service[apache2]"
   end