wordpress: move db migration to wp-cli

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 75276495b445850d039bfa7161d091470b91af3a..b29f95f3f0f63bd069dc96dee765be7f32c389de 100644 (file)
--- 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
 
   # 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") }
     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
   end
 
   ssl_certificate new_resource.site do


@@ -180,12 +188,6 @@ action :create do
     reload_apache false
   end
 
     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
   wordpress_plugin "wp-fail2ban" do
     site new_resource.site
     reload_apache false