Use ruby cookbook to install ruby for prometheus

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

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 03aadec28d40a2ecc587b3f0889fb2fcc5437686..078b926f5d2675f1e9b95d25664f456158fbfdcf 100644 (file)
--- 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
   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
   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
   end
 
   directory plugin_directory do