X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/96f98aa16d3addc9ad695be770b1f4f30f9e55fd..b9c0d9f47a55952cdb03690a9d1b865dd072c588:/cookbooks/mediawiki/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 0295c413f..6018b047a 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -85,7 +85,7 @@ systemd_service "mediawiki-sitemap@" do
   exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/generateSitemap.php --server=https://%i --urlpath=https://%i/ --fspath=/srv/%i --quiet --skip-redirects"
   user node[:mediawiki][:user]
   nice 10
-  sandbox true
+  sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
   read_write_paths "/srv/%i"
@@ -98,10 +98,11 @@ end
 
 systemd_service "mediawiki-jobs@" do
   description "Run mediawiki jobs for %i"
-  exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=175 --memory-limit=2048M --procs=8 --nothrottle --quiet"
+  exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=175 --memory-limit=2048M --procs=8"
   user node[:mediawiki][:user]
   nice 10
-  sandbox true
+  runtime_max_sec 3600
+  sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
   read_write_paths "/srv/%i"
@@ -115,12 +116,14 @@ end
 
 systemd_service "mediawiki-email-jobs@" do
   description "Run mediawiki email jobs for %i"
-  exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=55 --type=enotifNotify --memory-limit=2048M --procs=4 --nothrottle --quiet"
+  exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=55 --type=enotifNotify --memory-limit=2048M --procs=4"
   user node[:mediawiki][:user]
   nice 10
+  runtime_max_sec 3600
   sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
+  read_write_paths "/srv/%i"
 end
 
 systemd_timer "mediawiki-email-jobs@" do
@@ -130,18 +133,11 @@ systemd_timer "mediawiki-email-jobs@" do
 end
 
 systemd_service "mediawiki-refresh-links@" do
-  description "Refresh mediawiki links for %i"
-  exec_start "/usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/refreshLinks.php --server=https://%i --memory-limit=2048M --quiet"
-  user node[:mediawiki][:user]
-  nice 10
-  sandbox true
-  memory_deny_write_execute false
-  restrict_address_families "AF_UNIX"
+  action :delete
 end
 
 systemd_timer "mediawiki-refresh-links@" do
-  description "Refresh mediawiki links for %i"
-  on_calendar "Sat 00:05"
+  action :delete
 end
 
 systemd_service "mediawiki-cleanup-gs" do