richard: server/kolabd/kolabd/dist_conf suse,1.3,1.4
cvs at intevation.de
cvs at intevation.de
Fri Dec 23 21:46:08 CET 2005
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv15427/dist_conf
Modified Files:
suse
Log Message:
* dist_conf/suse: removed the not needed references to the openpkg
variables, like: @l_ngrp@, @l_musr@, etc as they are not used in
the suse environment
Corrected emailserver_sasl_conffile for suse.
Changed most of the users and groups to root, this is a known user
and it takes care that kolab_bootstrap at least finishes.
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- suse 22 Dec 2005 22:11:37 -0000 1.3
+++ suse 23 Dec 2005 20:46:06 -0000 1.4
@@ -1,22 +1,13 @@
-# @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_usr=root
+kolab_grp=root
+kolab_musr=root
+kolab_mgrp=root
kolab_uid=1002
-# @l_ngid@
kolab_gid=1002
-# @l_rusr@
-restricted_kolab_usr=kolab-r
-# @l_rgrp@
-restricted_kolab_grp=kolab-r
+restricted_kolab_usr=root
+restricted_kolab_grp=root
kolab_rusr=${restricted_kolab_usr}
kolab_rgrp=${restricted_kolab_grp}
-# @l_susr@
kolab_susr=root
BASHELL=/bin/bash
@@ -32,11 +23,8 @@
amavisd_confdir=${sysconfdir}/kolab/amavisd
amavisd_logfile=${localstatedir}/log/amavisd
amavisd_home=${localstatedir}/amavisd
-# @l_rusr@
amavisd_rusr=kolab-r
-# @l_musr@
amavisd_usr=kolab
-# @l_rgrp@
amavisd_grp=kolab-r
fsl_logfile=${localstatedir}/log/fsl
@@ -50,16 +38,11 @@
clamav_datadir=${datadir}/clamav
freshclam_logfile=${localstatedir}/log/freshclam.log
freshclam_pidfile=${sysrundir}/freshclam.pid
-# @l_rusr@
clamav_rusr=${restricted_kolab_usr}
-# @l_musr@
clamav_usr=kolab
-# @l_rgrp@
clamav_grp=${restricted_kolab_usr}
-# @l_musr@
postfix_usr=kolab
-# @l_rgrp@
postfix_grp=kolab-r
emailscan_usr=${restricted_kolab_usr}
@@ -72,11 +55,10 @@
emailserver_imapdir=${localstatedir}/imapd
emailserver_imapspooldir=${localstatedir}/imapd/spool
emailserver_sievedir=${localstatedir}/imapd/sieve
-emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
+emailserver_sasl_conffile=(libdir}/sasl2/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_musr=kolab
emailserver_grp=${restricted_kolab_grp}
-# @l_musr@
emailserver_mail_usr=kolab
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
@@ -92,9 +74,7 @@
imap_confdir=${sysconfdir}/imapd
imap_confperm=0640
-# @l_musr@
imap_usr=kolab
-# @l_rgrp@
imap_grp=kolab-r
imap_masterlogfile=${localstatedir}/log/imapd/master.log
imap_misclogfile=${localstatedir}/log/imapd/misc.log
@@ -118,9 +98,7 @@
ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_confdir=${sysconfdir}/openldap
-# @l_musr@
ldapserver_usr=kolab
-# @l_mgrp@
ldapserver_grp=kolab
webserver_document_root=/srv/www/htdocs
@@ -151,9 +129,7 @@
resmgr_logfile=${localstatedir}/resmgr/resmgr.log
resmgr_confdir=${sysconfdir}/resmgr
resmgr_filterdir=${localstatedir}/resmgr/filter
-# @l_musr@
resmgr_usr=kolab
-# @l_ngrp@
resmgr_grp=kolab-n
fbview_logfile=${localstatedir}/resmgr/fbview.log
@@ -162,3 +138,4 @@
graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+
More information about the commits
mailing list