aboutsummaryrefslogtreecommitdiffstats
path: root/modules/openldap
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-20 11:52:54 +0000
committerMichael Scherer <misc@mageia.org>2010-11-20 11:52:54 +0000
commitcd6351ab1212d5dea85db326113c887065b1efd6 (patch)
tree65c1f714456ce8ec15ff71eca0106f903dbc2e52 /modules/openldap
parentc173069efea53f72fc7c6a758f8eebe772464a6f (diff)
downloadpuppet-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/openldap')
-rw-r--r--modules/openldap/templates/slapd.conf8
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf
index faf46dba..7edab29b 100644
--- a/modules/openldap/templates/slapd.conf
+++ b/modules/openldap/templates/slapd.conf
@@ -1,9 +1,3 @@
-<%
-dc_suffix = 'dc=' + domain.gsub('.',',dc=')
-path_module_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/openldap"
-
-%>
-
# slapd.conf template
include /usr/share/openldap/schema/core.schema
include /usr/share/openldap/schema/cosine.schema
@@ -32,7 +26,7 @@ include /usr/share/openldap/schema/openssh-lpk_openldap.schema
pidfile /var/run/ldap/slapd.pid
argsfile /var/run/ldap/slapd.args
-modulepath <%= path_module_directory %>
+modulepath <%= lib_dir %>/openldap
moduleload back_monitor.la
moduleload syncprov.la
moduleload ppolicy.la