diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
| commit | cd6351ab1212d5dea85db326113c887065b1efd6 (patch) | |
| tree | 65c1f714456ce8ec15ff71eca0106f903dbc2e52 /modules/catdap | |
| parent | c173069efea53f72fc7c6a758f8eebe772464a6f (diff) | |
| download | puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.gz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.bz2 puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.xz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.zip | |
- do not let file with passwords to be world readable
( even if being readable by apache is not good either, but needed as the password is used by apache )
- use ldaps for sympa
- use the 2 new facter macro and remove the version copied everywhere
- remove hardcoded domain in bugzilla and others
Diffstat (limited to 'modules/catdap')
| -rw-r--r-- | modules/catdap/manifests/init.pp | 5 | ||||
| -rw-r--r-- | modules/catdap/templates/catdap_local.yml | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp index ad97fc29..018b6ed5 100644 --- a/modules/catdap/manifests/init.pp +++ b/modules/catdap/manifests/init.pp @@ -25,8 +25,9 @@ class catdap { file { "$catdap_location/catdap_local.yml": ensure => present, - owner => apache, - mode => 600, + owner => root, + group => apache, + mode => 640, content => template("catdap/catdap_local.yml"), require => Subversion::Snapshot[$catdap_location] } diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml index b62f80a4..50f43601 100644 --- a/modules/catdap/templates/catdap_local.yml +++ b/modules/catdap/templates/catdap_local.yml @@ -1,8 +1,4 @@ <% -# domain come from facter - -dc_suffix = 'dc=' + domain.gsub('.',',dc=') - ldap_server = 'ldap.' + domain ldap_password = catdap_password |