aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/openldap/manifests/slave.pp6
-rw-r--r--modules/openldap/templates/slapd-slave.sysconfig (renamed from modules/openldap/templates/ldap-slave.sysconfig)6
2 files changed, 8 insertions, 4 deletions
diff --git a/modules/openldap/manifests/slave.pp b/modules/openldap/manifests/slave.pp
index bbc65f48..ba0cfb9d 100644
--- a/modules/openldap/manifests/slave.pp
+++ b/modules/openldap/manifests/slave.pp
@@ -14,6 +14,10 @@ class openldap::slave($rid) inherits openldap {
}
Openldap::Config['/etc/sysconfig/ldap'] {
- content => template('openldap/ldap-slave.sysconfig'),
+ content => template('openldap/ldap.sysconfig'),
+ }
+
+ Openldap::Config['/etc/sysconfig/slapd'] {
+ content => template('openldap/slapd-slave.sysconfig'),
}
}
diff --git a/modules/openldap/templates/ldap-slave.sysconfig b/modules/openldap/templates/slapd-slave.sysconfig
index 6ac9055a..9bff24ff 100644
--- a/modules/openldap/templates/ldap-slave.sysconfig
+++ b/modules/openldap/templates/slapd-slave.sysconfig
@@ -2,7 +2,7 @@
SLAPDSYSLOGLEVEL="0"
SLAPDSYSLOGLOCALUSER="local4"
-# SLAPD URL list
+# SLAPD URL list
SLAPDURLLIST="ldap:/// ldaps:/// ldapi:///"
# Config file to use for slapd
@@ -15,7 +15,7 @@ SLAPDURLLIST="ldap:/// ldaps:/// ldapi:///"
# Should file permissions on database files be fixed at startup. Default is yes
# FIXPERMS=no
-# Whether database recovery should be run before starting slapd in start
+# Whether database recovery should be run before starting slapd in start
# (not strictly be necessary in 2.3). Default is no
# AUTORECOVER=yes
@@ -33,6 +33,6 @@ RUN_DB_BACKUP=never
# How many files slapd should be able to have open. By default, the process
# will inherit the default per-process limit (usually 1024), which may
# not be enough, so ulimit -n is run with the value in MAXFILES (which
-# defaults to 1024 as well). 4096 is the maximum OpenLDAP will use without
+# defaults to 1024 as well). 4096 is the maximum OpenLDAP will use without
# recompiling.
# MAXFILES=4096