Adapt LocalSettings.php to MediaWiki 1.24.3 and reduce diffs to a LocalSettings.php regenerated from scratch by this MediaWiki version.
Move the confidential $wgSecretKey and $wgUpgradeKey to the hidden wiki-config.php as well. They have already been updated on the server for maintaining security.

svn path=/trunk/; revision=893
This commit is contained in:
Colin Finck 2015-04-16 21:10:38 +00:00
parent d1218013bb
commit 6fdb6886fc
2 changed files with 58 additions and 52 deletions

View File

@ -1,5 +1,5 @@
<?php
# This file was automatically generated by the MediaWiki 1.17.0
# This file was automatically generated by the MediaWiki 1.24.2
# installer. If you make manual changes, please keep track in case you
# need to recreate them later.
#
@ -8,7 +8,7 @@
# file, not there.
#
# Further documentation for configuration settings may be found at:
# http://www.mediawiki.org/wiki/Manual:Configuration_settings
# https://www.mediawiki.org/wiki/Manual:Configuration_settings
# Protect against web entry
if ( !defined( 'MEDIAWIKI' ) ) {
@ -18,66 +18,68 @@ if ( !defined( 'MEDIAWIKI' ) ) {
## Uncomment this to disable output compression
# $wgDisableOutputCompression = true;
$wgSitename = "ReactOS";
$wgSitename = "ReactOS Wiki";
$wgMetaNamespace = "Reactos_wiki";
## The URL base path to the directory containing the wiki;
## defaults for all runtime URL paths are based off of this.
## For more information on customizing the URLs please see:
## http://www.mediawiki.org/wiki/Manual:Short_URL
$wgScriptPath = "/wiki";
$wgScriptExtension = ".php";
## For more information on customizing the URLs
## (like /w/index.php/Page_title to /wiki/Page_title) please see:
## https://www.mediawiki.org/wiki/Manual:Short_URL
$wgScriptPath = "/wiki";
$wgScriptExtension = ".php";
## The protocol and server name to use in fully-qualified URLs
#$wgServer is commented out here to let MediaWiki auto-detect it
## The relative URL path to the skins directory
$wgStylePath = "$wgScriptPath/skins";
$wgStylePath = "$wgScriptPath/skins";
## The relative URL path to the logo. Make sure you change this from the default,
## or else you'll overwrite your logo when you upgrade!
$wgLogo = "$wgStylePath/common/images/wiki.png";
$wgLogo = "$wgScriptPath/resources/assets/wiki.png";
## UPO means: this is also a user preference option
$wgEnableEmail = false;
$wgEnableUserEmail = true; # UPO
$wgEnableEmail = false;
$wgEnableUserEmail = true; # UPO
$wgEmergencyContact = "ros-web@reactos.org";
$wgPasswordSender = "ros-web@reactos.org";
$wgPasswordSender = "ros-web@reactos.org";
$wgEnotifUserTalk = false; # UPO
$wgEnotifWatchlist = false; # UPO
$wgEnotifUserTalk = false; # UPO
$wgEnotifWatchlist = false; # UPO
$wgEmailAuthentication = true;
## Database settings
$wgDBtype = "mysql";
require_once("../../www.reactos.org_config/wiki-config.php");
# MySQL specific settings
$wgDBprefix = "";
$wgDBprefix = "";
# MySQL table options to use during installation or update
$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
# Experimental charset support for MySQL 4.1/5.0.
$wgDBmysql5 = false;
## Shared memory settings
$wgMainCacheType = CACHE_NONE;
$wgMainCacheType = CACHE_NONE;
$wgMemCachedServers = array();
## To enable image uploads, make sure the 'images' directory
## is writable, then set this to true:
$wgEnableUploads = true;
$wgEnableUploads = true;
$wgGroupPermissions['*']['upload'] = false;
$wgGroupPermissions['user']['upload'] = true;
$wgGroupPermissions['*']['reupload'] = false;
$wgFileExtensions = array('png','gif','jpg','jpeg','doc','xls','pdf','ppt','tiff','bmp','docx', 'xlsx', 'pptx','odt', 'ogg', 'mp3');
#$wgUseImageMagick = true;
#$wgImageMagickConvertCommand = "/usr/bin/convert";
# InstantCommons allows wiki to use images from http://commons.wikimedia.org
$wgUseInstantCommons = false;
$wgUseInstantCommons = false;
## If you use ImageMagick (or any other shell command) on a
## Linux server, this will need to be set to the name of an
@ -90,10 +92,6 @@ $wgShellLocale = "en_US.utf8";
## this, if it's not already uncommented:
#$wgHashedUploadDirectory = false;
## If you have the appropriate support software installed
## you can enable inline LaTeX equations:
$wgUseTeX = false;
## Set $wgCacheDirectory to a writable directory on the web server
## to make your wiki go slightly faster. The directory should not
## be publically accessible from the web.
@ -102,25 +100,19 @@ $wgUseTeX = false;
# Site language code, should be one of ./languages/Language(.*).php
$wgLanguageCode = "en";
$wgSecretKey = "190071721adb67145f9a02d61f4a84cd2a15980845d562ec64750e83f634c92";
#$wgSecretKey moved to wiki-config.php
# Site upgrade key. Must be set to a string (default provided) to turn on the
# web installer while LocalSettings.php is in place
$wgUpgradeKey = "132dccc4e3e9ddf";
## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
$wgDefaultSkin = "vector";
#$wgUpgradeKey moved to wiki-config.php
## For attaching licensing metadata to pages, and displaying an
## appropriate copyright notice / icon. GNU Free Documentation
## License and Creative Commons licenses are supported so far.
#$wgEnableCreativeCommonsRdf = true;
$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html";
$wgRightsText = "GNU Free Documentation License 1.3";
$wgRightsIcon = "${wgStylePath}/common/images/gnu-fdl.png";
# $wgRightsCode = ""; # Not yet used
$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html";
$wgRightsText = "GNU Free Documentation License 1.3 or later";
$wgRightsIcon = "{$wgResourceBasePath}/resources/assets/licenses/gnu-fdl.png";
# Path to the GNU diff3 utility. Used for conflict resolution.
$wgDiff3 = "/usr/bin/diff3";
@ -130,11 +122,21 @@ $wgGroupPermissions['*']['edit'] = false;
$wgGroupPermissions['*']['createpage'] = false;
$wgGroupPermissions['*']['createtalk'] = false;
# Query string length limit for ResourceLoader. You should only set this if
# your web server has a query string length limit (then set it to that limit),
# or if you have suhosin.get.max_value_length set in php.ini (then set it to
# that value)
$wgResourceLoaderMaxQueryLength = -1;
## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'vector', 'monobook':
$wgDefaultSkin = "vector";
# Enabled skins.
# The following skins were automatically enabled:
require_once "$IP/skins/Vector/Vector.php";
# Enabled Extensions. Most extensions are enabled by including the base extension file here
# but check specific extension documentation for more details
# The following extensions were automatically enabled:
require_once "$IP/extensions/ParserFunctions/ParserFunctions.php";
require_once "$IP/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php";
require_once "$IP/extensions/WikiEditor/WikiEditor.php";
# End of automatically generated settings.
@ -156,19 +158,14 @@ $wgEnableMWSuggest = true;
$wgNamespaceToBeSearchedDefault[100] = true;
$wgShowExceptionDetails = true;
require_once("$IP/../../www.reactos.org_config/wiki-drupal-config.php");
require_once ($IP.'/extensions/AuthDrupal/AuthDrupal.php');
SetupAuthDrupal();
# Use wikipedia's new editor interface
require_once( "$IP/extensions/WikiEditor/WikiEditor.php" );
$wgDefaultUserOptions['usebetatoolbar'] = 1;
$wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
$wgDefaultUserOptions['wikieditor-preview'] = 1;
$wgDefaultUserOptions['wikieditor-publish'] = 1;
$wgDefaultUserOptions['usenavigabletoc'] = 1;
# Enable advanced parser functions
require_once( "$IP/extensions/ParserFunctions/ParserFunctions.php" );
require_once( "$IP/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php" );
$wgPFEnableStringFunctions = true;

View File

@ -1,6 +1,15 @@
<?php
$wgDBserver = "localhost";
$wgDBname = "wiki";
$wgDBuser = "wiki";
$wgDBpassword = "";
## Database settings
$wgDBtype = "mysql";
$wgDBserver = "localhost";
$wgDBname = "wiki";
$wgDBuser = "wiki";
$wgDBpassword = "wiki";
$wgSecretKey = "190071721adb67145f9a02d61f4a84cd2a15980845d562ec64750e83f634c92";
# Site upgrade key. Must be set to a string (default provided) to turn on the
# web installer while LocalSettings.php is in place
$wgUpgradeKey = "132dccc4e3e9ddf";