diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-02-23 17:02:56 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-02-23 17:02:56 +0000 |
| commit | aeebe079ad9298da311decd2695188ef24826575 (patch) | |
| tree | 8deefd46507805276e2d6f951bd0b267d6da615e | |
| parent | 6c4510057062ee6ff1a97483f046afa77e5e054c (diff) | |
| download | puppet-aeebe079ad9298da311decd2695188ef24826575.tar puppet-aeebe079ad9298da311decd2695188ef24826575.tar.gz puppet-aeebe079ad9298da311decd2695188ef24826575.tar.bz2 puppet-aeebe079ad9298da311decd2695188ef24826575.tar.xz puppet-aeebe079ad9298da311decd2695188ef24826575.zip | |
mgapeople: Add class parameter for maintdburl
| -rw-r--r-- | manifests/nodes/alamut.pp | 1 | ||||
| -rw-r--r-- | modules/mgapeople/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/mgapeople/templates/mgapeople.conf | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp index 0a0fa8ca..f597439c 100644 --- a/manifests/nodes/alamut.pp +++ b/manifests/nodes/alamut.pp @@ -112,5 +112,6 @@ node alamut { bindpw => extlookup('mgapeople_ldap','x'), vhost => 'people.mageia.org', vhostdir => '/var/www/vhosts/people.mageia.org', + maintdburl => 'http://pkgsubmit.mageia.org/data/maintdb.txt', } } diff --git a/modules/mgapeople/manifests/init.pp b/modules/mgapeople/manifests/init.pp index df2d787a..9d09f6fe 100644 --- a/modules/mgapeople/manifests/init.pp +++ b/modules/mgapeople/manifests/init.pp @@ -1,6 +1,7 @@ class mgapeople( $site_name = 'people.mageia.org', $groupbase = 'ou=Group,dc=mageia,dc=org', + $maintdburl = undef, $ldap_server, $binddn, $bindpw, diff --git a/modules/mgapeople/templates/mgapeople.conf b/modules/mgapeople/templates/mgapeople.conf index ec1b2392..11964f27 100644 --- a/modules/mgapeople/templates/mgapeople.conf +++ b/modules/mgapeople/templates/mgapeople.conf @@ -4,5 +4,7 @@ bindpwfile: <%= @bindpw_file %> groupbase: <%= @groupbase %> output_dir: <%= @vhostdir %> tmpl_dir: /usr/share/mgapeople/tmpl -maintdburl: http://pkgsubmit.mageia.org/data/maintdb.txt +<%- if @maintdburl -%> +maintdburl: <%= @maintdburl %> +<%- end -%> sitename: <%= @site_name %> |