X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1ebe519fb753057e4fcc2a02401cc6d2c20cee14..3a54ecf08f7466a7223ffe8860d1578800027e36:/cookbooks/mediawiki/resources/site.rb diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 0508bcbad..870f08313 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -205,10 +205,9 @@ 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" end @@ -457,7 +456,7 @@ action :create do mediawiki_extension "osmtaginfo" do site new_resource.site - repository "https://github.com/Firefishy/osmtaginfo.git" + repository "https://github.com/openstreetmap/osmtaginfo.git" tag "live" update_site false end @@ -469,27 +468,6 @@ action :create do update_site false end - mediawiki_extension "SimpleMap" do - site new_resource.site - template "mw-ext-SimpleMap.inc.php.erb" - repository "https://github.com/Firefishy/SimpleMap.git" - tag "live" - update_site false - action :delete - end - - mediawiki_extension "SlippyMap" do - site new_resource.site - update_site false - action :delete - end - - mediawiki_extension "Mantle" do - site new_resource.site - update_site false - action :delete - end - mediawiki_extension "DisableAccount" do site new_resource.site template "mw-ext-DisableAccount.inc.php.erb" @@ -508,11 +486,17 @@ 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 + 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