From 2b64360fa6f20f0c190e5a765d75688556ea949f Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 31 Aug 2026 21:47:31 +0100 Subject: [PATCH] Move wiki CrawlerProtection upstream to Mediawiki cookbook --- cookbooks/mediawiki/resources/site.rb | 7 +++++++ cookbooks/wiki/recipes/default.rb | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index b6ca8e48c..6b1ff6fc0 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -529,6 +529,13 @@ action :create do end end + mediawiki_extension "CrawlerProtection" do + site new_resource.site + repository "https://github.com/mywikis/CrawlerProtection.git" + reference "main" + update_site false + end + cookbook_file "#{site_directory}/cc-wiki.png" do cookbook "mediawiki" owner node[:mediawiki][:user] diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 505bcde11..048140ffe 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -173,12 +173,6 @@ mediawiki_extension "DiscussionTools" do site site_name end -mediawiki_extension "CrawlerProtection" do - site site_name - repository "https://github.com/mywikis/CrawlerProtection.git" - reference "main" -end - cookbook_file "/srv/#{site_name}/osm_logo_wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] -- 2.47.3