summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-02-22 12:50:10 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-02-22 12:53:14 (GMT)
commitb5ded2abeea2106d708756a6b2da5104f29f142d (patch)
tree383db673f2b68c7e2b512cc5bcf3cf2d56a6d56a
parent84d74bbbf404229e8d5c3619e45b4e3beb0a1f38 (diff)
downloadkolab-conf-b5ded2abeea2106d708756a6b2da5104f29f142d.tar.gz
perl-Kolab does not handle nested if/else/endif very well, either causing the template to be terminated at 'moduleload' or to incorrectly include the TLS configuration during bootstrap.
Fixes issue4708, bug #49.
-rw-r--r--conf/templates/slapd.conf.template4
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/templates/slapd.conf.template b/conf/templates/slapd.conf.template
index 075028a..82a2395 100644
--- a/conf/templates/slapd.conf.template
+++ b/conf/templates/slapd.conf.template
@@ -52,12 +52,8 @@ argsfile @@@ldapserver_argsfile@@@
# or dynamically build. When build dynamically the module must be loaded.
# As the slapd that comes with the openpkg version of kolab is statically
# build it is not necessary to load the module.
-@@@if ldapserver_modulepath@@@
moduleload syncprov
@@@else@@@
-# moduleload syncprov
-@@@endif@@@
-@@@else@@@
replica-pidfile @@@ldapserverslurpd_pidfile@@@
replogfile @@@ldapserver_replogfile@@@
replicationinterval 5