martin: server/kolabd/kolabd/dist_conf common, 1.26, 1.27 debian, 1.7, 1.8 kolab, 1.32, 1.33 mandriva, 1.6, 1.7 suse, 1.41, 1.42

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv31233/kolabd/dist_conf

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Applied "Relocating scripts from /etc" from Gunnar Wrobel


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- common	9 Mar 2006 21:40:05 -0000	1.26
+++ common	9 Mar 2006 21:52:02 -0000	1.27
@@ -91,6 +91,7 @@
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
 	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
 	-e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
 	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debian	9 Mar 2006 21:40:05 -0000	1.7
+++ debian	9 Mar 2006 21:52:02 -0000	1.8
@@ -82,6 +82,7 @@
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/lib/ldap

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab	9 Mar 2006 21:40:05 -0000	1.32
+++ kolab	9 Mar 2006 21:52:02 -0000	1.33
@@ -117,6 +117,7 @@
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
+kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
 
 ldapserver_statedir=${localstatedir}/openldap

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mandriva	9 Mar 2006 21:40:05 -0000	1.6
+++ mandriva	9 Mar 2006 21:52:02 -0000	1.7
@@ -45,6 +45,7 @@
 
 kolab_logdir=/var/log/kolab
 kolab_pidfile=/var/run/kolab/kolab.pid
+kolab_scriptsdir=$(sysconfdir)/kolab
 
 ldapserver_dir=${localstatedir}/ldap-kolab
 ldapserver_rundir=/var/run/ldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- suse	9 Mar 2006 21:40:05 -0000	1.41
+++ suse	9 Mar 2006 21:52:02 -0000	1.42
@@ -96,6 +96,7 @@
 perl_kolab_rpm=perl-kolab
 kolab_smtpdpolicy_conffile_usr=root
 kolab_smtpdpolicy_conffile_grp=nobody
+kolab_scriptsdir=$(sysconfdir)/kolab
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just