martin: server/kolabd/kolabd/dist_conf common, 1.25, 1.26 debian, 1.6, 1.7 kolab, 1.31, 1.32 mandriva, 1.5, 1.6 suse, 1.40, 1.41

[cvs at intevation.de]

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel (make user setting for running ldap server explicit)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- common	9 Mar 2006 21:37:37 -0000	1.25
+++ common	9 Mar 2006 21:40:05 -0000	1.26
@@ -105,6 +105,7 @@
 	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
 	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
 	-e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
+	-e 's,[@]ldapserver_rusr[@],$(ldapserver_rusr),g' \
 	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
 	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debian	9 Mar 2006 21:37:37 -0000	1.6
+++ debian	9 Mar 2006 21:40:05 -0000	1.7
@@ -95,6 +95,7 @@
 ldapserver_confdir=${sysconfdir}/ldap
 ldapserver_usr=ldap
 ldapserver_grp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/var/www
 webserver_cgidir=${webserver_document_root}/cgi-bin

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolab	9 Mar 2006 21:37:37 -0000	1.31
+++ kolab	9 Mar 2006 21:40:05 -0000	1.32
@@ -134,6 +134,7 @@
 # @l_mgrp@
 ldapserver_grp=kolab
 ldapserver_rgrp=kolab-r
+ldapserver_rusr=kolab
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mandriva	9 Mar 2006 21:37:37 -0000	1.5
+++ mandriva	9 Mar 2006 21:40:05 -0000	1.6
@@ -53,6 +53,7 @@
 ldapserver_argsfile=/var/run/ldap/slapd.args
 ldapserver_usr=ldap
 ldapserver_grp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/var/www/html/kolab
 webserver_logdir=/var/log/httpd

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- suse	9 Mar 2006 21:37:37 -0000	1.40
+++ suse	9 Mar 2006 21:40:05 -0000	1.41
@@ -116,6 +116,7 @@
 ldapserver_usr=ldap
 ldapserver_grp=ldap
 ldapserver_rgrp=ldap
+ldapserver_rusr=ldap
 
 webserver_document_root=/srv/www/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin