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

cvs at kolab.org cvs at kolab.org
Fri Jul 20 18:37:01 CEST 2007


Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	kolab 
Log Message:
Make changing user names easier for dist_conf/kolab (see kolab/issue1862)


Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -d -r1.42 -r1.42.2.1
--- kolab	11 Feb 2007 14:47:51 -0000	1.42
+++ kolab	20 Jul 2007 16:36:59 -0000	1.42.2.1
@@ -38,11 +38,11 @@
 amavisd_logfile=${localstatedir}/amavisd/amavisd.log
 amavisd_home=${localstatedir}/amavisd
 # @l_rusr@
-amavisd_rusr=kolab-r
+amavisd_rusr=${kolab_rusr}
 # @l_musr@
-amavisd_usr=kolab
+amavisd_usr=${kolab_musr}
 # @l_rgrp@
-amavisd_grp=kolab-r
+amavisd_grp=${kolab_rgrp}
 amavisd_rpm=amavisd
 
 
@@ -56,31 +56,31 @@
 freshclam_logfile=${localstatedir}/clamav/freshclam.log
 freshclam_pidfile=${sysrundir}/freshclam.pid
 # @l_rusr@
-clamav_rusr=kolab-r
+clamav_rusr=${kolab_rusr}
 # @l_musr@
-clamav_usr=kolab
+clamav_usr=${kolab_musr}
 # @l_rgrp@
-clamav_grp=kolab-r
+clamav_grp=${kolab_rgrp}
 
 # @l_musr@
 # @l_rgrp@
 
 
-emailscan_usr=kolab-r
-emailscan_grp=kolab-r
+emailscan_usr=${kolab_rusr}
+emailscan_grp=${kolab_rgrp}
 
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/kolab/lmtp
 emailserver_localstatedir=${localstatedir}/postfix
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
 emailserver_usr=${kolab_usr}
-emailserver_musr=kolab
-emailserver_grp=kolab-r
+emailserver_musr=${kolab_musr}
+emailserver_grp=${kolab_rgrp}
 # @l_musr@
-emailserver_mail_owner=kolab
-emailserver_setgid_grp=kolab-r
-emailserver_default_privs=kolab-n
-emailserver_master_usr=kolab-n
+emailserver_mail_owner=${kolab_musr}
+emailserver_setgid_grp=${kolab_rgrp}
+emailserver_default_privs=${kolab_usr}
+emailserver_master_usr=${kolab_usr}
 emailserver_rpm=postfix
 emailserver_tables_usr=root
 
@@ -88,7 +88,7 @@
 ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
 ftpserver_confdir=${sysconfdir}/proftpd
 ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
-ftpserver_musr=kolab
+ftpserver_musr=${kolab_musr}
 ftpserver_usr=${kolab_usr}
 ftpserver_grp=${kolab_grp}
 # Why hardcoded uid/gid???
@@ -98,9 +98,9 @@
 imap_confdir=${sysconfdir}/imapd
 imap_confperm=0640
 # @l_musr@
-imap_usr=kolab
+imap_usr=${kolab_musr}
 # @l_rgrp@
-imap_grp=kolab-r
+imap_grp=${kolab_rgrp}
 imap_masterlogfile=${localstatedir}/imapd/log/master.log
 imap_misclogfile=${localstatedir}/imapd/log/misc.log
 imap_statedir=${localstatedir}/imapd
@@ -136,11 +136,11 @@
 ldapserver_schemadir=${sysconfdir}/openldap/schema
 ldapserver_confdir=${sysconfdir}/openldap
 # @l_musr@
-ldapserver_usr=kolab
+ldapserver_usr=${kolab_musr}
 # @l_mgrp@
-ldapserver_grp=kolab
-ldapserver_rgrp=kolab-r
-ldapserver_rusr=kolab
+ldapserver_grp=${kolab_mgrp}
+ldapserver_rgrp=${kolab_rgrp}
+ldapserver_rusr=${kolab_musr}
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin
@@ -158,7 +158,7 @@
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 # webserver_web_prefix is empty indeed
 webserver_web_prefix=
-webserver_musr=kolab
+webserver_musr=${kolab_musr}
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
 webserver_rpm=apache
@@ -181,15 +181,15 @@
 resmgr_filterdir=${localstatedir}/resmgr/filter
 resmgr_scriptsdir=${resmgr_confdir}
 # @l_musr@
-resmgr_usr=kolab
+resmgr_usr=${kolab_musr}
 # @l_ngrp@
-resmgr_grp=kolab-n
+resmgr_grp=${kolab_grp}
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logfile=${localstatedir}/resmgr/freebusy.log
 freebusy_cachedir=${webserver_document_root}/freebusy/cache
-freebusy_usr=kolab
-freebusy_grp=kolab-n
+freebusy_usr=${kolab_musr}
+freebusy_grp=${kolab_grp}
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db





More information about the commits mailing list