1 files changed, 52 insertions, 19 deletions

diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index 0a10ede3..30085556 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -7,7 +7,12 @@
 # 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' ) ) {
+        exit;
+}
 
 $IP = '/usr/share/mediawiki';
 if (! isset($DIR)) $DIR = getcwd();
@@ -22,28 +27,33 @@ if ( $wgCommandLineMode ) {
                 die( "This script must be run from the command line\n" );
         }
 }
+
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
 $wgSitename = "<%= title %>";
-
-wfLoadSkin( 'CologneBlue' );
-wfLoadSkin( 'Modern' );
-wfLoadSkin( 'MonoBook' );
-wfLoadSkin( 'Vector' );
+$wgMetaNamespace = ""; # FIXME
 
 ## 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
+## 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 = "/<%= path %>";
 $wgScriptExtension = ".php";
 
+## The protocol and server name to use in fully-qualified URLs
+$wgServer = "http://localhost"; # FIXME
+
+## The URL path to static resources (images, scripts, etc.)
+$wgResourceBasePath = $wgScriptPath;
+
 ## The relative URL path to the skins directory
 $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 = "$wgResourceBasePath/resources/assets/wiki.png";
 $wgLogo = "$wgStylePath/common/images/wiki.png";
 
 ## UPO means: this is also a user preference option
@@ -72,7 +82,7 @@ $wgDBts2schema = "public";
 
 ## Shared memory settings
 $wgMainCacheType = CACHE_NONE;
-$wgMemCachedServers = array();
+$wgMemCachedServers = [];
 
 ## To enable image uploads, make sure the 'images' directory
 ## is writable, then set this to true:
@@ -82,16 +92,18 @@ $wgEnableUploads = false;
 $wgUseImageMagick = false;
 #$wgImageMagickConvertCommand = "/usr/bin/convert";
 
+# InstantCommons allows wiki to use images from https://commons.wikimedia.org
+$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
 ## available UTF-8 locale
 $wgShellLocale = "en_US.UTF-8";
 
-## If you want to use image uploads under safe mode,
-## create the directories images/archive, images/thumb and
-## images/temp, and make them all writable. Then uncomment
-## this, if it's not already uncommented:
-# $wgHashedUploadDirectory = 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.
+#$wgCacheDirectory = "$IP/cache";
 
 ## If you have the appropriate support software installed
 ## you can enable inline LaTeX equations:
@@ -104,13 +116,17 @@ $wgUseTeX = false;
 
 $wgLocalInterwiki = strtolower( $wgSitename );
 
+# Site language code, should be one of the list in ./languages/data/Names.php
 $wgLanguageCode = "<%= lang %>";
 
 $wgSecretKey = "<%= secret_key %>";
 
-## Default skin: you can change the default skin. Use the internal symbolic
-## names, ie 'vector', 'monobook':
-$wgDefaultSkin = 'vector';
+# Changing this will log out all existing sessions.
+$wgAuthenticationTokenVersion = "1";
+
+# Site upgrade key. Must be set to a string (default provided) to turn on the
+# web installer while LocalSettings.php is in place
+$wgUpgradeKey = "11cf6c808b264138"; # FIXME
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
@@ -118,14 +134,31 @@ $wgDefaultSkin = 'vector';
 $wgEnableCreativeCommonsRdf = true;
 # TODO add a proper page
 $wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
-$wgRightsUrl = "http://creativecommons.org/licenses/by-sa/3.0/";
+$wgRightsUrl = "https://creativecommons.org/licenses/by-sa/3.0/";
 $wgRightsText = "Creative Common - Attribution - ShareAlike 3.0";
 # TODO get the icon to host it on our server
-$wgRightsIcon = "http://i.creativecommons.org/l/by-sa/3.0/88x31.png";
+$wgRightsIcon = "https://licensebuttons.net/l/by-sa/3.0/88x31.png";
 # $wgRightsCode = "gfdl1_3"; # Not yet used
 
+# Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 
+## 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:
+wfLoadSkin( 'CologneBlue' );
+wfLoadSkin( 'Modern' );
+wfLoadSkin( 'MonoBook' );
+wfLoadSkin( 'Vector' );
+
+
+# End of automatically generated settings.
+# Add more configuration options below.
+
+
 # When you make changes to this configuration file, this will make
 # sure that cached pages are cleared.
 $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );