summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-02-09 09:42:21 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-02-09 09:42:21 (GMT)
commitd022c6aefc75f1fe569977e26f9654e7e87669a9 (patch)
tree7fbfc1c96aed7dcff9b25b473383991e414bd7ff
parent32609687db9f5cfbbdf9038991f01a6a0ee589aa (diff)
downloadkolab-conf-d022c6aefc75f1fe569977e26f9654e7e87669a9.tar.gz
Added passwd_confdir variable which indicates the path of the configuration directory for the Horde passwd application. This corrects the previous path correction as the configuration files need to end up in client/passwd/config.
-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
5 files changed, 5 insertions, 0 deletions
diff --git a/conf/dist/common b/conf/dist/common
index 8f42e6d..3cfd53b 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -159,4 +159,5 @@ do_subst = sed \
-e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
-e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
-e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
+ -e 's=[@]passwd_confdir[@]=$(passwd_confdir)=g' \
-e 's=[@]turba_confdir[@]=$(turba_confdir)=g'
diff --git a/conf/dist/debian b/conf/dist/debian
index a028fc4..a6c03f1 100644
--- a/conf/dist/debian
+++ b/conf/dist/debian
@@ -141,6 +141,7 @@ kronolith_confdir=${sysconfdir}/kolab-webclient/kronolith2
mimp_confdir=${sysconfdir}/kolab-webclient/mimp1
mnemo_confdir=${sysconfdir}/kolab-webclient/mnemo2
nag_confdir=${sysconfdir}/kolab-webclient/nag2
+passwd_confdir=${sysconfdir}/kolab-webclient/passwd1
turba_confdir=${sysconfdir}/kolab-webclient/turba2
phpini_dir=${sysconfdir}/kolab
diff --git a/conf/dist/kolab b/conf/dist/kolab
index b811d56..3df41fb 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -158,6 +158,7 @@ kronolith_confdir=${webserver_document_root}/client/kronolith/config
mimp_confdir=${webserver_document_root}/client/mimp/config
mnemo_confdir=${webserver_document_root}/client/mnemo/config
nag_confdir=${webserver_document_root}/client/nag/config
+passwd_confdir=${webserver_document_root}/client/passwd/config
turba_confdir=${webserver_document_root}/client/turba/config
phpini_dir=${sysconfdir}/apache
diff --git a/conf/dist/suse b/conf/dist/suse
index 19e2707..ec3ec98 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -143,6 +143,7 @@ kronolith_confdir=${webserver_document_root}/client/kronolith/config
mimp_confdir=${webserver_document_root}/client/mimp/config
mnemo_confdir=${webserver_document_root}/client/mnemo/config
nag_confdir=${webserver_document_root}/client/nag/config
+passwd_confdir=${webserver_document_root}/client/passwd/config
turba_confdir=${webserver_document_root}/client/turba/config
phpini_dir=${sysconfdir}/php5/cli
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 3d107ee..64e9591 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -57,6 +57,7 @@ kronolith_confdir: @kronolith_confdir@
mimp_confdir: @mimp_confdir@
mnemo_confdir: @mnemo_confdir@
nag_confdir: @nag_confdir@
+passwd_confdir: @passwd_confdir@
turba_confdir: @turba_confdir@
kolab_statedir: @kolab_statedir@
kolab_pidfile: @kolab_pidfile@