X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/59df18a47e1431952fcf82ca8ab318c2566370dc..d3642419b55ba188b273a9a2e1592191042a0714:/cookbooks/wordpress/definitions/wordpress_site.rb?ds=sidebyside diff --git a/cookbooks/wordpress/definitions/wordpress_site.rb b/cookbooks/wordpress/definitions/wordpress_site.rb index fcdf69485..8211f4cd0 100644 --- 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