From: Grant Slater <github@firefishy.com>
Date: Fri, 11 Aug 2023 15:37:09 +0000 (+0100)
Subject: wordpress: ignore failure to activate SVN plugins. Pin wp-fail2ban release
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0a6889527f95e185d70a5f3a8fc916114b1a109c

wordpress: ignore failure to activate SVN plugins. Pin wp-fail2ban release
---

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 933f63b5e..078b926f5 100644
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -68,6 +68,7 @@ action :create do
     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
 
diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 52bba4ce5..e4096614f 100644
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -192,6 +192,7 @@ action :create do
 
   wordpress_plugin "wp-fail2ban" do
     site new_resource.site
+    version "5.1.1"
     reload_apache false
   end