diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-10-22 21:19:52 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-10-22 21:19:52 +0000 |
| commit | 686bb1cac232dec4f05b086456762139f5118eb6 (patch) | |
| tree | cc6c1f49617c7eb6366b364924d1baa1b598c695 /modules | |
| parent | bc3dbd0f8bcaa55472b463378bc7d11e61d5129d (diff) | |
| download | puppet-686bb1cac232dec4f05b086456762139f5118eb6.tar puppet-686bb1cac232dec4f05b086456762139f5118eb6.tar.gz puppet-686bb1cac232dec4f05b086456762139f5118eb6.tar.bz2 puppet-686bb1cac232dec4f05b086456762139f5118eb6.tar.xz puppet-686bb1cac232dec4f05b086456762139f5118eb6.zip | |
add wiki_settings option
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mediawiki/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/mediawiki/templates/LocalSettings.php | 2 |
2 files changed, 3 insertions, 1 deletions
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 %> |