From cf4186880853ccf48cf9938df39687f671a018b9 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 28 Jul 2023 23:24:14 +0100 Subject: [PATCH] wordpress: move db migration to wp-cli --- cookbooks/wordpress/resources/site.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb index 75276495b..b29f95f3f 100644 --- a/cookbooks/wordpress/resources/site.rb +++ b/cookbooks/wordpress/resources/site.rb @@ -146,11 +146,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" + 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 @@ -180,12 +188,6 @@ 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 reload_apache false -- 2.43.2