diff options
| -rw-r--r-- | deployment/wikis/manifests/init.pp | 6 | ||||
| -rw-r--r-- | modules/mediawiki/manifests/init.pp | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp index 132dc64f..6ed08d10 100644 --- a/deployment/wikis/manifests/init.pp +++ b/deployment/wikis/manifests/init.pp @@ -1,6 +1,12 @@ class wikis { include mediawiki::base + class { "mediawiki::config": + pgsql_password => extlookup("mediawiki_pgsql",'x'), + secretkey => extlookup("mediawiki_secretkey",'x'), + ldap_password => extlookup('mediawiki_ldap','x'), + } + mediawiki::instance { "en": title => "Mageia wiki", } diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp index 74286205..586ecb7a 100644 --- a/modules/mediawiki/manifests/init.pp +++ b/modules/mediawiki/manifests/init.pp @@ -1,4 +1,7 @@ class mediawiki { + class config($pgsql_password, $secretkey, $ldap_password) { + } + class base { $root = "/srv/wiki/" @@ -23,9 +26,8 @@ class mediawiki { $user = "mediawiki" - $pgsql_password = extlookup("mediawiki_pgsql",'x') postgresql::remote_user { $user: - password => $pgsql_password, + password => $config::pgsql_password, } # TODO create the ldap user @@ -59,8 +61,8 @@ class mediawiki { $wiki_root = "$mediawiki::base::root/$path" $db_name = "mediawiki_$name" $db_user = "$mediawiki::base::user" - $db_password = "$mediawiki::base::pgsql_password" - $secret_key = extlookup("mediawiki_secretkey",'x') + $db_password = "$mediawiki::config::pgsql_password" + $secret_key = "$mediawiki::config::secretkey" file { "$wiki_root": ensure => directory @@ -83,7 +85,7 @@ class mediawiki { refreshonly => true, onlyif => "test -d $wiki_root/config", } - $ldap_password = extlookup('mediawiki_ldap','x') + $ldap_password = $config::ldap_password file { "$wiki_root/LocalSettings.php": ensure => present, |