X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f07069124c9ad841f765ed1114b51b801a39fce5..2c3e1c95e07c62283306dadcbb723c7b7b30a5eb:/cookbooks/mediawiki/resources/site.rb diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 7909bfe6b..a3a84a376 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -195,19 +195,20 @@ action :create do comment "Run mediawiki jobs" minute "*/3" user node[:mediawiki][:user] - command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/runJobs.php --server=https://#{new_resource.site} --maxtime=160 --memory-limit=2048M --procs=8 --quiet" + command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/runJobs.php --server=https://#{new_resource.site} --maxtime=175 --memory-limit=2048M --procs=8 --nothrottle --quiet" end cron_d "mediawiki-#{cron_name}-email-jobs" do comment "Run mediawiki email jobs" user node[:mediawiki][:user] - command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/runJobs.php --server=https://#{new_resource.site} --maxtime=30 --type=enotifNotify --memory-limit=2048M --procs=4 --quiet" + command "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 #{site_directory}/w/maintenance/runJobs.php --server=https://#{new_resource.site} --maxtime=55 --type=enotifNotify --memory-limit=2048M --procs=4 --nothrottle --quiet" end cron_d "mediawiki-#{cron_name}-refresh-links" do - comment "Run mediawiki refresh links table daily" + comment "Run mediawiki refresh links table weekly" minute "5" hour "0" + weekday "6" 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 @@ -456,7 +457,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 @@ -468,27 +469,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"