X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1934f47340e1cdd2ffb814c1d9b77d28a3fa621a..326bfea5448bcd22cd294a1fd0f2505bf083f6cf:/cookbooks/wordpress/resources/site.rb?ds=sidebyside diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb index 2705bac2a..c86705d5d 100644 --- a/cookbooks/wordpress/resources/site.rb +++ b/cookbooks/wordpress/resources/site.rb @@ -1,14 +1,13 @@ -# -# Cookbook Name:: wordpress +# Cookbook:: wordpress # Resource:: wordpress_site # -# Copyright 2015, OpenStreetMap Foundation +# Copyright:: 2015, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -21,7 +20,7 @@ require "securerandom" default_action :create -property :site, :kind_of => String, :name_attribute => true +property :site, :kind_of => String, :name_property => true property :aliases, :kind_of => [String, Array] property :directory, :kind_of => String property :version, :kind_of => String @@ -29,25 +28,24 @@ 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_prefix, :kind_of => String, :default => "wp_" -property :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false property :urls, :kind_of => Hash, :default => {} property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true action :create do version = new_resource.version || Chef::Wordpress.current_version - node.normal_unless[:wordpress][:sites][new_resource.site] = {} - - node.normal[:wordpress][:sites][new_resource.site][:directory] = site_directory + node.default[:wordpress][:sites][new_resource.site] = { + :directory => site_directory + } - node.normal_unless[:wordpress][:sites][new_resource.site][:auth_key] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:secure_auth_key] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:logged_in_key] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:nonce_key] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:auth_salt] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:secure_auth_salt] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:logged_in_salt] = SecureRandom.base64(48) - node.normal_unless[:wordpress][:sites][new_resource.site][:nonce_salt] = SecureRandom.base64(48) + auth_key = persistent_token("wordpress", new_resource.site, "auth_key") + secure_auth_key = persistent_token("wordpress", new_resource.site, "secure_auth_key") + logged_in_key = persistent_token("wordpress", new_resource.site, "logged_in_key") + nonce_key = persistent_token("wordpress", new_resource.site, "nonce_key") + auth_salt = persistent_token("wordpress", new_resource.site, "auth_salt") + secure_auth_salt = persistent_token("wordpress", new_resource.site, "secure_auth_salt") + logged_in_salt = persistent_token("wordpress", new_resource.site, "logged_in_salt") + nonce_salt = persistent_token("wordpress", new_resource.site, "nonce_salt") mysql_user "#{new_resource.database_user}@localhost" do password new_resource.database_password @@ -60,12 +58,12 @@ action :create do declare_resource :directory, site_directory do owner node[:wordpress][:user] group node[:wordpress][:group] - mode 0o755 + mode "755" end subversion site_directory do action :sync - repository "http://core.svn.wordpress.org/tags/#{version}" + repository "https://core.svn.wordpress.org/tags/#{version}" user node[:wordpress][:user] group node[:wordpress][:group] ignore_failure true @@ -77,14 +75,14 @@ action :create do line.gsub!(/password_here/, new_resource.database_password) line.gsub!(/wp_/, new_resource.database_prefix) - line.gsub!(/('AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:auth_key]}'") - line.gsub!(/('SECURE_AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:secure_auth_key]}'") - line.gsub!(/('LOGGED_IN_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:logged_in_key]}'") - line.gsub!(/('NONCE_KEY', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:nonce_key]}'") - line.gsub!(/('AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:auth_salt]}'") - line.gsub!(/('SECURE_AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:secure_auth_salt]}'") - line.gsub!(/('LOGGED_IN_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:logged_in_salt]}'") - line.gsub!(/('NONCE_SALT', *)'put your unique phrase here'/, "\\1'#{node[:wordpress][:sites][new_resource.site][:nonce_salt]}'") + line.gsub!(/('AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{auth_key}'") + line.gsub!(/('SECURE_AUTH_KEY', *)'put your unique phrase here'/, "\\1'#{secure_auth_key}'") + line.gsub!(/('LOGGED_IN_KEY', *)'put your unique phrase here'/, "\\1'#{logged_in_key}'") + line.gsub!(/('NONCE_KEY', *)'put your unique phrase here'/, "\\1'#{nonce_key}'") + line.gsub!(/('AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{auth_salt}'") + line.gsub!(/('SECURE_AUTH_SALT', *)'put your unique phrase here'/, "\\1'#{secure_auth_salt}'") + line.gsub!(/('LOGGED_IN_SALT', *)'put your unique phrase here'/, "\\1'#{logged_in_salt}'") + line.gsub!(/('NONCE_SALT', *)'put your unique phrase here'/, "\\1'#{nonce_salt}'") if line =~ /define\('WP_DEBUG'/ line += "\n" @@ -92,10 +90,8 @@ action :create do line += " * Don't allow file editing.\n" line += " */\n" line += "define('DISALLOW_FILE_EDIT', true);\n" - if new_resource.ssl_enabled - line += "define('FORCE_SSL_LOGIN', true);\n" - line += "define('FORCE_SSL_ADMIN', true);\n" - end + line += "define('FORCE_SSL_LOGIN', true);\n" + line += "define('FORCE_SSL_ADMIN', true);\n" end line @@ -104,14 +100,14 @@ action :create do file "#{site_directory}/wp-config.php" do owner node[:wordpress][:user] group node[:wordpress][:group] - mode 0o644 + mode "644" content wp_config end declare_resource :directory, "#{site_directory}/wp-content/uploads" do owner "www-data" group "www-data" - mode 0o755 + mode "755" end file "#{site_directory}/sitemap.xml" do @@ -126,13 +122,19 @@ action :create do cookbook "wordpress" owner node[:wordpress][:user] group node[:wordpress][:group] - mode 0o644 + mode "644" backup false end ssl_certificate new_resource.site do domains [new_resource.site] + Array(new_resource.aliases) - only_if { new_resource.ssl_enabled } + end + + php_fpm new_resource.site do + php_admin_values "open_basedir" => "#{site_directory}/:/usr/share/php/:/tmp/", + "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open" + php_values "upload_max_filesize" => "70M", + "post_max_size" => "100M" end apache_site new_resource.site do @@ -140,14 +142,13 @@ action :create do template "apache.erb" directory site_directory variables :aliases => Array(new_resource.aliases), - :urls => new_resource.urls, - :ssl_enabled => new_resource.ssl_enabled + :urls => new_resource.urls reload_apache false end - http_request "http://#{new_resource.site}/wp-admin/upgrade.php" do + http_request "https://#{new_resource.site}/wp-admin/upgrade.php" do action :nothing - url "http://#{new_resource.site}/wp-admin/upgrade.php?step=1" + url "https://#{new_resource.site}/wp-admin/upgrade.php?step=1" subscribes :get, "subversion[#{site_directory}]" end @@ -201,6 +202,7 @@ end action_class do include Chef::Mixin::EditFile + include Chef::Mixin::PersistentToken def site_directory new_resource.directory || "/srv/#{new_resource.site}"