From: Tom Hughes <tom@compton.nu>
Date: Mon, 24 Sep 2018 07:31:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/193'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a13e534419ef9916f954ec14f2e9320b254c3310?hp=5c15439e5e036fcf3cf80ad762e4c5def22717da

Merge remote-tracking branch 'github/pull/193'
---

diff --git a/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb
index 4c9eb99ad..589817a08 100644
--- a/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb
+++ b/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb
@@ -6,9 +6,14 @@ wfLoadExtension('Scribunto');
 // Use standalone mode
 $wgScribuntoDefaultEngine = 'luastandalone';
 
+// Increase cpu limit (default=7) per https://www.mediawiki.org/wiki/Topic:S9y4s52ue722seam
+// Documented in https://www.mediawiki.org/wiki/Extension:Scribunto#LuaStandalone
+// Max running time in seconds
+$wgScribuntoEngineConf['luastandalone']['cpuLimit'] = 15;
+
 // Set path to lua interpreter
 $wgScribuntoEngineConf['luastandalone']['luaPath'] = '/usr/bin/lua';
-        
+
 // Enable syntax highlighting
 $wgScribuntoUseGeSHi = true;