summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2009-08-27 21:13:18 (GMT)
committerMathieu Parent <math.parent@gmail.com>2009-08-27 21:13:18 (GMT)
commit9ebea40bf063db85fae817c85b36afa509fadf0a (patch)
tree9bdbf33f0afdadcb8465e6f971bd2f660656a7df
parent6837302deff0723014788771a4f38ad039b7a78a (diff)
downloadkolab-conf-9ebea40bf063db85fae817c85b36afa509fadf0a.tar.gz
kolab/issue3765 (dist_conf'iguration for openldap module loading)
-rw-r--r--conf/dist/common1
-rw-r--r--conf/dist/debian1
-rw-r--r--conf/dist/kolab1
-rw-r--r--conf/dist/suse1
-rw-r--r--conf/kolab.globals.in1
-rw-r--r--conf/templates/slapd.conf.template.in12
6 files changed, 17 insertions, 0 deletions
diff --git a/conf/dist/common b/conf/dist/common
index 5da5a71..8f42e6d 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -112,6 +112,7 @@ do_subst = sed \
-e 's=[@]ldapserverslurpd_pidfile[@]=$(ldapserverslurpd_pidfile)=g' \
-e 's=[@]ldapserver_statedir[@]=$(ldapserver_statedir)=g' \
-e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
+ -e 's=[@]ldapserver_modulepath[@]=$(ldapserver_modulepath)=g' \
-e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
-e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
-e 's=[@]pki_grp[@]=$(pki_grp)=g' \
diff --git a/conf/dist/debian b/conf/dist/debian
index 831d8a3..a028fc4 100644
--- a/conf/dist/debian
+++ b/conf/dist/debian
@@ -109,6 +109,7 @@ ldapserver_usr=openldap
ldapserver_grp=openldap
ldapserver_rgrp=openldap
ldapserver_rusr=openldap
+ldapserver_modulepath=/usr/lib/ldap
webserver_document_root=/usr/share/kolab
#webserver_tmpdir=
diff --git a/conf/dist/kolab b/conf/dist/kolab
index 1cdc8b6..b811d56 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -125,6 +125,7 @@ ldapserver_usr=${kolab_musr}
ldapserver_grp=${kolab_mgrp}
ldapserver_rgrp=${kolab_rgrp}
ldapserver_rusr=${kolab_musr}
+ldapserver_modulepath=false
webserver_document_root=${localstatedir}/kolab/www
webserver_tmpdir=/tmp
diff --git a/conf/dist/suse b/conf/dist/suse
index cd75e5f..0398954 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -131,6 +131,7 @@ webserver_web_prefix=
webserver_musr=wwwrun
webserver_usr=wwwrun
webserver_grp=www
+ldapserver_modulepath=false
#webclient
horde_cookie_path=/client
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 5f42a77..3d107ee 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -78,6 +78,7 @@ ldapserver_statedir : @ldapserver_statedir@
ldapserver_rusr : @ldapserver_rusr@
ldapserver_grp : @ldapserver_grp@
ldapserver_rgrp : @ldapserver_rgrp@
+ldapserver_modulepath : @ldapserver_modulepath@
libexecdir : @libexecdir@
WITHOPENPKG : @WITHOPENPKG@
LDAPD : @LDAPD@
diff --git a/conf/templates/slapd.conf.template.in b/conf/templates/slapd.conf.template.in
index 6602ef6..70a6e3a 100644
--- a/conf/templates/slapd.conf.template.in
+++ b/conf/templates/slapd.conf.template.in
@@ -13,6 +13,14 @@ KOLAB_META_END
# this file is automatically written by the Kolab config backend and should have the
# file mode 0640
+@@@if ldapserver_modulepath@@@
+modulepath @@@ldapserver_modulepath@@@
+moduleload back_bdb
+moduleload back_monitor
+moduleload refint
+moduleload unique
+@@@endif@@@
+
# manual additions are lost unless made to the template in the Kolab config directory
# the template is @sysconfdir@/kolab/templates/slapd.conf.template
@@ -31,7 +39,11 @@ 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@