Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52615
Change subject: Configure for development
......................................................................
Configure for development
- Verbose debug output
- Profiling based on URL params (forceprofile/forcetrace)
- localsettings => LocalSettings.php
- memcached port back to 11211
- mediawiki-debug.log log file
Change-Id: Ide918954bc469249b50f7d06a0529fd5cfe05307
---
A mediawiki-debug.log
M modules/mediawiki/manifests/init.pp
A modules/mediawiki/templates/LocalSettings.php
D modules/mediawiki/templates/localsettings
M modules/memcached/manifests/init.pp
5 files changed, 53 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/15/52615/1
diff --git a/mediawiki-debug.log b/mediawiki-debug.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mediawiki-debug.log
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 7813ffc..6ac2b91 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -53,7 +53,7 @@
file { "/srv/mediawiki/LocalSettings.php":
require => Exec["mediawiki_setup"],
- content => template("mediawiki/localsettings"),
+ content => template("mediawiki/LocalSettings.php"),
ensure => present;
}
diff --git a/modules/mediawiki/templates/LocalSettings.php
b/modules/mediawiki/templates/LocalSettings.php
new file mode 100644
index 0000000..f8c1774
--- /dev/null
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -0,0 +1,51 @@
+<?php
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+###
+### Changes to this file will be clobbered by Puppet.
+### If you need to hand-edit local settings, modify
+### LocalSettings.php in the Vagrant project root.
+###
+#####################################################################
+
+// Enable error reporting
+error_reporting( -1 );
+ini_set( 'display_errors', 1 );
+
+// Expose debug info for PHP errors.
+$wgDebugToolbar = true;
+$wgShowDebug = true;
+$wgShowExceptionDetails = true;
+$wgDebugLogFile = '/srv/mediawiki-debug.log';
+
+// Expose debug info for SQL errors.
+$wgDebugDumpSql = true;
+$wgShowDBErrorBacktrace = true;
+$wgShowSQLErrors = true;
+
+// Profiling
+$wgDebugProfiling = false;
+
+require( __DIR__ . '/../LocalSettings.php' );
+
+$wgArticlePath = "/wiki/$1";
+$wgLogo = '/srv/vagrant-wmf-logo.png';
+
+$wgGroupPermissions['*']['createpage'] = false;
+
+// Caching
+$wgMainCacheType = CACHE_MEMCACHED;
+$wgMemCachedServers = array( '127.0.0.1:11211' );
+
+$wgEnableJavaScriptTest = true;
+
+$wgProfilerParams = array(
+ 'forceprofile' => 'ProfilerSimpleText',
+ 'forcetrace' => 'ProfilerSimpleTrace'
+);
+
+foreach( $wgProfilerParams as $param => $cls ) {
+ if ( array_key_exists( $param, $_REQUEST ) ) {
+ $wgProfiler['class'] = $cls;
+ }
+}
diff --git a/modules/mediawiki/templates/localsettings
b/modules/mediawiki/templates/localsettings
deleted file mode 100644
index 5987d4f..0000000
--- a/modules/mediawiki/templates/localsettings
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-###
-### Changes to this file will be clobbered by Puppet.
-### If you need to hand-edit local settings, modify
-### LocalSettings.php in the Vagrant project root.
-###
-#####################################################################
-
-require( __DIR__ . '/../LocalSettings.php' );
-
-$wgArticlePath = "/wiki/$1";
-$wgLogo = '/srv/vagrant-wmf-logo.png';
-
-$wgGroupPermissions['*']['createpage'] = false;
-
-# Memcached
-$wgMainCacheType = CACHE_MEMCACHED;
-$wgMemCachedServers = array( "127.0.0.1:11000" );
-
-$wgEnableJavaScriptTest = true;
diff --git a/modules/memcached/manifests/init.pp
b/modules/memcached/manifests/init.pp
index 0176066..83bac78 100644
--- a/modules/memcached/manifests/init.pp
+++ b/modules/memcached/manifests/init.pp
@@ -1,7 +1,7 @@
class memcached {
$memcached_size = "200" # Mb
- $memcached_port = "11000"
+ $memcached_port = "11211"
$memcached_ip = "0.0.0.0"
package { ["memcached", "libmemcached6"]:
--
To view, visit https://gerrit.wikimedia.org/r/52615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide918954bc469249b50f7d06a0529fd5cfe05307
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
