aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-04-19 23:08:20 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-04-20 11:19:53 +0200
commitc9cf51c5adb5ea021383d171f35297930b88bd9d (patch)
treee11a7ba347f4a0cf3ba7a0d488a6c6188436fee4 /modules
parente0bdd1d0e8a6f14bb519aa5ddc9cd6165455704d (diff)
downloadpuppet-c9cf51c5adb5ea021383d171f35297930b88bd9d.tar
puppet-c9cf51c5adb5ea021383d171f35297930b88bd9d.tar.gz
puppet-c9cf51c5adb5ea021383d171f35297930b88bd9d.tar.bz2
puppet-c9cf51c5adb5ea021383d171f35297930b88bd9d.tar.xz
puppet-c9cf51c5adb5ea021383d171f35297930b88bd9d.zip
Mediawiki: Remove deprecated settings, use new ones
- $IP no longer has to be set manually since 1.18 - $wgScriptExtension was removed in 1.27.0 - $wgUseTeX was removed in 1.18.0, replaced by Extension:Math - $wgLocalInterwiki is obsoleted, replaced by $wgLocalInterwikis - $wgRightsCode does not exist - $wgCacheEpoch trick obsoleted since 1.17, replaced by $wgInvalidateCacheOnLocalSettingsChange - $wgMinimalPasswordLength deprecated since 1.26 in favor of $wgPasswordPolicy (but still in use as of this commit)
Diffstat (limited to 'modules')
-rw-r--r--modules/mediawiki/templates/LocalSettings.php50
1 files changed, 19 insertions, 31 deletions
diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index 30085556..7dfb1de1 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -14,25 +14,11 @@ if ( !defined( 'MEDIAWIKI' ) ) {
exit;
}
-$IP = '/usr/share/mediawiki';
-if (! isset($DIR)) $DIR = getcwd();
-
-$path = array( $IP, "$IP/includes", "$IP/languages" );
-set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
-
-require_once( "$IP/includes/DefaultSettings.php" );
-
-if ( $wgCommandLineMode ) {
- if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
- die( "This script must be run from the command line\n" );
- }
-}
-
## Uncomment this to disable output compression
# $wgDisableOutputCompression = true;
$wgSitename = "<%= title %>";
-$wgMetaNamespace = ""; # FIXME
+# $wgMetaNamespace = ""; # Defaults to $wgSitename
## The URL base path to the directory containing the wiki;
## defaults for all runtime URL paths are based off of this.
@@ -40,10 +26,9 @@ $wgMetaNamespace = ""; # FIXME
## (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
+$wgServer = "https://wiki.mageia.org";
## The URL path to static resources (images, scripts, etc.)
$wgResourceBasePath = $wgScriptPath;
@@ -105,16 +90,13 @@ $wgShellLocale = "en_US.UTF-8";
## be publically accessible from the web.
#$wgCacheDirectory = "$IP/cache";
-## 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.
#$wgCacheDirectory = "$IP/cache";
-$wgLocalInterwiki = strtolower( $wgSitename );
+# Array of interwiki prefixes for current wiki.
+$wgLocalInterwikis = array( strtolower( $wgSitename ) );
# Site language code, should be one of the list in ./languages/data/Names.php
$wgLanguageCode = "<%= lang %>";
@@ -126,7 +108,9 @@ $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
+# FIXME: This should be set to a secure value:
+# https://www.mediawiki.org/wiki/Manual:$wgUpgradeKey
+# $wgUpgradeKey = "";
## For attaching licensing metadata to pages, and displaying an
## appropriate copyright notice / icon. GNU Free Documentation
@@ -135,10 +119,9 @@ $wgEnableCreativeCommonsRdf = true;
# TODO add a proper page
$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
$wgRightsUrl = "https://creativecommons.org/licenses/by-sa/3.0/";
-$wgRightsText = "Creative Common - Attribution - ShareAlike 3.0";
+$wgRightsText = "Creative Commons - Attribution-ShareAlike 3.0 Unported";
# TODO get the icon to host it on our server
$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";
@@ -159,9 +142,16 @@ wfLoadSkin( 'Vector' );
# 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__ ) ) );
+# Setting this to true will invalidate all cached pages whenever
+# LocalSettings.php is changed.
+$wgInvalidateCacheOnLocalSettingsChange = true;
+
+# FIXME: Obsoleted, to be replaced by $wgPasswordPolicy
+# https://www.mediawiki.org/wiki/Manual:$wgPasswordPolicy
+$wgMinimalPasswordLength = 1;
+
+
+## LDAP setup
require_once 'extensions/LdapAuthentication/LdapAuthentication.php';
$wgAuth = new LdapAuthenticationPlugin();
@@ -177,7 +167,7 @@ $wgLDAPUseLocal = false;
$wgLDAPDomainNames = array( 'ldap' );
-#TODO make it workable with more than one server
+# TODO make it workable with more than one server
$wgLDAPServerNames = array( 'ldap' => 'ldap.<%= domain %>' );
$wgLDAPSearchStrings = array( 'ldap' => 'uid=USER-NAME,ou=People,<%= dc_suffix %>' );
@@ -203,6 +193,4 @@ $wgLDAPLowerCaseUsername = array( 'ldap' => true );
$wgLDAPPreferences = array( 'ldap' => array( 'email'=>'mail','realname'=>'cn','nickname'=>'uid','language'=>'preferredlanguage') );
-$wgMinimalPasswordLength = 1;
-
<%= wiki_settings %>