Delete mediawiki link refresh service and timer

[chef.git] / cookbooks / mediawiki / recipes / default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index ef1d35346435e44608f43548b8d3d4ff41b754c9..6018b047a574455a376765a6ceb72f9c4934640b 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -101,6 +101,7 @@ systemd_service "mediawiki-jobs@" do
   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
+  runtime_max_sec 3600
   sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
@@ -118,6 +119,7 @@ systemd_service "mediawiki-email-jobs@" do
   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"
@@ -131,19 +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=4096M -d error_reporting=22517 /srv/%i/w/maintenance/refreshLinks.php --server=https://%i --memory-limit=4096M"
-  user node[:mediawiki][:user]
-  nice 10
-  sandbox :enable_network => true
-  memory_deny_write_execute false
-  restrict_address_families "AF_UNIX"
-  read_write_paths "/srv/%i"
+  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