aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2026-02-22 16:23:54 -0800
committerDan Fandrich <danf@mageia.org>2026-02-22 16:23:54 -0800
commita084b85270826e004e293ce3a2a9f6da2f97a0dd (patch)
tree4cfadacca910c726f2501f9f9da8669dd665475e /modules
parent933cbb2f0839820f5ee674b064b5f324de620813 (diff)
downloadpuppet-master.tar
puppet-master.tar.gz
puppet-master.tar.bz2
puppet-master.tar.xz
puppet-master.zip
Set the wiki title againHEADmaster
The default title is just the language, which isn't very useful. This is a partial revert and change of commit 560aee1a1 and 28c48c739.
Diffstat (limited to 'modules')
-rw-r--r--modules/mediawiki/manifests/instance.pp3
-rw-r--r--modules/mediawiki/templates/LocalSettings.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/mediawiki/manifests/instance.pp b/modules/mediawiki/manifests/instance.pp
index 78949f20..3385be74 100644
--- a/modules/mediawiki/manifests/instance.pp
+++ b/modules/mediawiki/manifests/instance.pp
@@ -1,4 +1,5 @@
-define mediawiki::instance( $wiki_settings = '',
+define mediawiki::instance( $site_title,
+ $wiki_settings = '',
$skinsdir = '/usr/share/mediawiki/skins') {
include mediawiki::base
diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index c340dfd9..246fe329 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -24,7 +24,7 @@ set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_includ
## Uncomment this to disable output compression
# $wgDisableOutputCompression = true;
-$wgSitename = "<%= @title %>";
+$wgSitename = "<%= @site_title %>";
# $wgMetaNamespace = ""; # Defaults to $wgSitename
## The URL base path to the directory containing the wiki;