thomas: server/kolabd/kolabd/dist_conf kolab,1.42.2.1,1.42.2.2

cvs at kolab.org cvs at kolab.org
Fri Jul 20 22:15:01 CEST 2007


Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	kolab 
Log Message:
Fix kolab/issue1862 (dist_conf/kolab: Use settings from OpenPKG installation)


Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -d -r1.42.2.1 -r1.42.2.2
--- kolab	20 Jul 2007 16:36:59 -0000	1.42.2.1
+++ kolab	20 Jul 2007 20:14:59 -0000	1.42.2.2
@@ -1,22 +1,3 @@
-# @l_nusr@
-kolab_usr=kolab-n
-# @l_ngrp@
-kolab_grp=kolab-n
-# @l_musr@
-kolab_musr=kolab
-# @l_mgrp@
-kolab_mgrp=kolab
-# @l_nuid@
-kolab_uid=1002
-# @l_ngid@
-kolab_gid=1002
-# @l_rusr@
-kolab_rusr=kolab-r
-# @l_rgrp@
-kolab_rgrp=kolab-r
-# @l_susr@
-kolab_susr=root
-
 BASHELL=${libdir}/openpkg/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
@@ -24,6 +5,16 @@
 RPM=${KOLABRC} rpm
 TAR=${libdir}/openpkg/tar
 
+kolab_usr:=$(shell $(RPM) --eval %{l_nusr})
+kolab_grp:=$(shell $(RPM) --eval %{l_ngrp})
+kolab_musr:=$(shell $(RPM) --eval %{l_musr})
+kolab_mgrp:=$(shell $(RPM) --eval %{l_mgrp})
+kolab_uid:=$(shell $(RPM) --eval %{l_nuid})
+kolab_gid:=$(shell $(RPM) --eval %{l_ngid})
+kolab_rusr:=$(shell $(RPM) --eval %{l_rusr})
+kolab_rgrp:=$(shell $(RPM) --eval %{l_rgrp})
+kolab_susr:=$(shell $(RPM) --eval %{l_susr})
+
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap
 
@@ -82,7 +73,7 @@
 emailserver_default_privs=${kolab_usr}
 emailserver_master_usr=${kolab_usr}
 emailserver_rpm=postfix
-emailserver_tables_usr=root
+emailserver_tables_usr=${kolab_susr}
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/proftpd/proftpd.log





More information about the commits mailing list