Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73733
Change subject: Bump $wgMaxShellMemory to 512MB; drop ctag generation
......................................................................
Bump $wgMaxShellMemory to 512MB; drop ctag generation
phpsh fires a volley of warnings on start-up that all resolve to OOMs,
triggered by the hard quota set by $wgMaxShellMemory. This patch increases the
quota to 512MB (up from the default 128MB).
The patch also drops automatic generation of ctags. Autocompletion in phpsh
doesn't work very well and loading tags makes phpsh's slow start-up time even
slower.
Change-Id: I840f498932cccb96a580d444c08fa9bd7cabb70d
---
M LocalSettings.php
M puppet/modules/mediawiki/manifests/phpsh.pp
M puppet/modules/mediawiki/templates/rc.php.erb
3 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/33/73733/1
diff --git a/LocalSettings.php b/LocalSettings.php
index 52e8f49..83d3739 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -16,6 +16,7 @@
$wgUploadDirectory = '/srv/images';
$wgUploadPath = '/images';
$wgArticlePath = "/wiki/$1";
+$wgMaxShellMemory = 1024 * 512;
// Show the debug toolbar if 'debug' is set on the request, either as a
// parameter or a cookie.
diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp
b/puppet/modules/mediawiki/manifests/phpsh.pp
index f4dabcc..9856433 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -7,10 +7,6 @@
include mediawiki
include php
- package { 'exuberant-ctags':
- ensure => present,
- }
-
package { 'phpsh':
ensure => '1.3.1',
provider => pip,
@@ -28,11 +24,5 @@
file { '/etc/phpsh/rc.php':
require => Package['phpsh'],
content => template('mediawiki/rc.php.erb'),
- }
-
- exec { 'generate-ctags':
- require => [ Package['exuberant-ctags'], Git::Clone['mediawiki/core']
],
- command => "ctags --languages=php --recurse -f ${mediawiki::dir}/tags
${mediawiki::dir}",
- creates => "${mediawiki::dir}/tags",
}
}
diff --git a/puppet/modules/mediawiki/templates/rc.php.erb
b/puppet/modules/mediawiki/templates/rc.php.erb
index 07b648d..0d961f4 100644
--- a/puppet/modules/mediawiki/templates/rc.php.erb
+++ b/puppet/modules/mediawiki/templates/rc.php.erb
@@ -12,7 +12,7 @@
case '':
// MediaWiki codebase mode
chdir( '<%= scope.lookupvar("mediawiki::dir") %>' );
- include_once( '<%= scope.lookupvar("mediawiki::dir") %>/index.php' );
+ include_once 'index.php';
break;
case 'none':
// Vanilla PHP
--
To view, visit https://gerrit.wikimedia.org/r/73733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I840f498932cccb96a580d444c08fa9bd7cabb70d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
