From 686bb1cac232dec4f05b086456762139f5118eb6 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sat, 22 Oct 2011 21:19:52 +0000 Subject: add wiki_settings option --- modules/mediawiki/manifests/init.pp | 2 +- modules/mediawiki/templates/LocalSettings.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp index 5f03e26d..3e4137e9 100644 --- a/modules/mediawiki/manifests/init.pp +++ b/modules/mediawiki/manifests/init.pp @@ -48,7 +48,7 @@ class mediawiki { # do wiki basic installation - define instance($title) { + define instance($title, $wiki_settings = '') { include mediawiki::base diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php index c9aa9082..61340acb 100644 --- a/modules/mediawiki/templates/LocalSettings.php +++ b/modules/mediawiki/templates/LocalSettings.php @@ -156,3 +156,5 @@ $wgLDAPGroupNameAttribute = array( "ldap" => "cn" ); $wgLDAPLowerCaseUsername = array( "ldap" => true ); $wgMinimalPasswordLength = 1; + +<%= wiki_settings %> -- cgit v1.2.1