Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62417
Change subject: A few tuneups of LocalSettings.php:
......................................................................
A few tuneups of LocalSettings.php:
- $Remove definition of $wgScriptPath
(we don't need this because it's set by the MW setup script.)
- Set $wgServer to '"//" . $_SERVER["SERVER_NAME"]'
(Allows https as well as http for static content)
Change-Id: I85990d4d5051a38d3672595d6516a9f93bf3ed76
---
M modules/mediawiki_singlenode/templates/labs-localsettings
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/62417/1
diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings
b/modules/mediawiki_singlenode/templates/labs-localsettings
index e15ac52..7de451d 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -10,7 +10,6 @@
#####################################################################
$wgArticlePath = "/wiki/$1";
-$wgScriptPath = "/w";
require_once( "$IP/extensions/Nuke/Nuke.php" );
require_once( "$IP/extensions/SpamBlacklist/SpamBlacklist.php" );
@@ -28,6 +27,8 @@
# Include the complete settings file generated by mw install
require_once( 'orig/LocalSettings.php' );
+$wgServer = "//" . $_SERVER["SERVER_NAME"];
+
if ( ! $wgLogo or $wgLogo == '/wiki/skins/common/images/wiki.png' ) {
# Logo is either unset or defaulting to the standard wiki logo;
# use a labs one instead.
--
To view, visit https://gerrit.wikimedia.org/r/62417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85990d4d5051a38d3672595d6516a9f93bf3ed76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
