wordpress: run wp-cli tasks as www-data to match runtime

[chef.git] / cookbooks / wordpress / resources / plugin.rb

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 03aadec28d40a2ecc587b3f0889fb2fcc5437686..374e8928412d6a51fc6a816f4efe56f7e795ca4c 100644 (file)
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -65,18 +65,18 @@ action :create do
 
   execute "wp-cli plugin activate #{new_resource.plugin}" do
     command "/opt/wp-cli/wp --path=#{site_directory} plugin activate #{new_resource.plugin}"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
-    only_if { ::File.exist?("#{site_directory}/wp-config.php") }
+    user "www-data"
+    group "www-data"
+    not_if "/opt/wp-cli/wp --path=#{site_directory} plugin is-active #{new_resource.plugin}"
   end
 end
 
 action :delete do
   execute "wp-cli plugin deactivate #{new_resource.plugin}" do
     command "/opt/wp-cli/wp --path=#{site_directory} plugin deactivate #{new_resource.plugin}"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
-    only_if { ::File.exist?("#{site_directory}/wp-config.php") }
+    user "www-data"
+    group "www-data"
+    only_if "/opt/wp-cli/wp --path=#{site_directory} plugin is-active #{new_resource.plugin}"
   end
 
   directory plugin_directory do