X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1670bf67670d031aa64d09ca99a718861106cf1d..9694d64a67dca98ce1d574852e7114daaff4727f:/cookbooks/wordpress/resources/plugin.rb

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 03aadec28..078b926f5 100644
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -64,19 +64,20 @@ action :create do
   end
 
   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") }
+    command "/opt/wp-cli/wp --path='#{site_directory}' plugin activate '#{new_resource.plugin}'"
+    user "www-data"
+    group "www-data"
+    not_if "/opt/wp-cli/wp --path='#{site_directory}' plugin is-active '#{new_resource.plugin}'"
+    ignore_failure plugin_repository.start_with?("https://plugins.svn.wordpress.org/")
   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") }
+    command "/opt/wp-cli/wp --path='#{site_directory}' plugin deactivate '#{new_resource.plugin}'"
+    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