X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..431b819fcfd5422904451ff7b36d28f9feb30c39:/cookbooks/mediawiki/resources/site.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 0508bcbad..263c9337a 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -205,12 +205,11 @@ action :create do end cron_d "mediawiki-#{cron_name}-refresh-links" do - comment "Run mediawiki refresh links table weekly" + comment "Run mediawiki refresh links table daily" minute "5" hour "0" - weekday "0" user node[:mediawiki][:user] - command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/refreshLinks.php --server=https://#{new_resource.site} --memory-limit=2048M --quiet" + command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/refreshLinks.php --server=https://#{new_resource.site} --memory-limit=2048M --procs=4 --quiet" end cron_d "mediawiki-#{cron_name}-cleanup-gs" do @@ -508,11 +507,18 @@ action :create do update_site false end - # Broken Extension - 3 April 2022 - Remove. See https://github.com/openstreetmap/chef/pull/491#issuecomment-1086759504 - mediawiki_extension "QuickInstantCommons" do - site new_resource.site - update_site false - action :delete + if new_resource.commons + mediawiki_extension "QuickInstantCommons" do + site new_resource.site + update_site false + reference "master" + end + else + mediawiki_extension "QuickInstantCommons" do + site new_resource.site + update_site false + action :delete + end end cookbook_file "#{site_directory}/cc-wiki.png" do