X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d37b2b50ef3a2f0a29a5a17773138d2dec5c71d2..9d1da497d442b16de5ab68a9cf74f832059734e7:/cookbooks/wordpress/resources/site.rb?ds=sidebyside

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 6fdaeb4f8..e4096614f 100644
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -33,6 +33,7 @@ property :database_name, :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 :wp2fa_encrypt_key, :kind_of => String, :required => true
 property :urls, :kind_of => Hash, :default => {}
 property :fpm_max_children, :kind_of => Integer, :default => 10
 property :fpm_start_servers, :kind_of => Integer, :default => 4
@@ -100,6 +101,8 @@ action :create do
       line += "/**\r\n"
       line += " * Don't allow file editing.\r\n"
       line += " */\r\n"
+      line += "define( 'WP_HOME', 'https://#{new_resource.site}');\r\n"
+      line += "define( 'WP_SITEURL', 'https://#{new_resource.site}');\r\n"
       line += "define( 'DISALLOW_FILE_EDIT', true);\r\n"
       line += "define( 'DISALLOW_FILE_MODS', true);\r\n"
       line += "define( 'AUTOMATIC_UPDATER_DISABLED', true);\r\n"
@@ -108,6 +111,7 @@ action :create do
       line += "define( 'WP_FAIL2BAN_SITE_HEALTH_SKIP_FILTERS', true);\r\n"
       line += "define( 'WP_ENVIRONMENT_TYPE', 'production');\r\n"
       line += "define( 'WP_MEMORY_LIMIT', '128M');\r\n"
+      line += "define( 'WP2FA_ENCRYPT_KEY', '#{new_resource.wp2fa_encrypt_key}');\r\n"
     end
 
     line
@@ -144,11 +148,19 @@ action :create do
 
   # Setup wordpress database and create admin user with random password
   execute "wp core install" do
-    command "/opt/wp-cli/wp --path=#{site_directory} core install --url=#{new_resource.site} --title='#{new_resource.title}' --admin_user=#{new_resource.admin_user} --admin_email=#{new_resource.admin_email} --skip-email"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
+    command "/opt/wp-cli/wp --path='#{site_directory}' core install --url='#{new_resource.site}' --title='#{new_resource.title}' --admin_user='#{new_resource.admin_user}' --admin_email='#{new_resource.admin_email}' --skip-email"
+    user "www-data"
+    group "www-data"
     only_if { ::File.exist?("#{site_directory}/wp-config.php") }
-    not_if "/opt/wp-cli/wp  --path=#{site_directory} core is-installed"
+    not_if "/opt/wp-cli/wp  --path='#{site_directory}' core is-installed"
+  end
+
+  execute "wp core update-db" do
+    command "/opt/wp-cli/wp --path='#{site_directory}' core update-db"
+    user "www-data"
+    group "www-data"
+    only_if { ::File.exist?("#{site_directory}/wp-config.php") }
+    subscribes :run, "subversion[#{site_directory}]"
   end
 
   ssl_certificate new_resource.site do
@@ -178,14 +190,9 @@ action :create do
     reload_apache false
   end
 
-  http_request "https://#{new_resource.site}/wp-admin/upgrade.php" do
-    action :nothing
-    url "https://#{new_resource.site}/wp-admin/upgrade.php?step=1"
-    subscribes :get, "subversion[#{site_directory}]"
-  end
-
   wordpress_plugin "wp-fail2ban" do
     site new_resource.site
+    version "5.1.1"
     reload_apache false
   end