richard: server/kolabd/kolabd/dist_conf common, 1.16, 1.17 kolab, 1.20, 1.21 suse, 1.22, 1.23
cvs at intevation.de
cvs at intevation.de
Tue Jan 17 20:20:19 CET 2006
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv28405/dist_conf
Modified Files:
common kolab suse
Log Message:
introduce *_rpm variables, for checking rpm package versions
Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- common 15 Jan 2006 20:56:28 -0000 1.16
+++ common 17 Jan 2006 19:20:17 -0000 1.17
@@ -19,11 +19,11 @@
-e 's,[@]RPM[@],$(RPM),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
- -e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
+ -e 's,[@]amavisd_rpm[@],$(amavisd_rpm),g' \
-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
@@ -43,11 +43,12 @@
-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
+ -e 's,[@]emailserver_rpm[@],$(emailserver_rpm),g' \
-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
- -e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
-e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
+ -e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -68,6 +69,7 @@
-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
+ -e 's,[@]imap_rpm[@],$(imap_rpm),g' \
-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
-e 's,[@]imap_spool[@],$(imap_spool),g' \
-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
@@ -79,11 +81,14 @@
-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
+ -e 's,[@]kolab_resource_handlers_rpm[@],$(kolab_resource_handlers_rpm),g' \
-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
+ -e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
+ -e 's,[@]kolab_webadmin_rpm[@],$(kolab_webadmin_rpm),g' \
-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
@@ -95,12 +100,13 @@
-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
+ -e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+ -e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
- -e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
@@ -113,6 +119,7 @@
-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
+ -e 's,[@]webserver_rpm[@],$(webserver_rpm),g' \
-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolab 15 Jan 2006 20:56:28 -0000 1.20
+++ kolab 17 Jan 2006 19:20:17 -0000 1.21
@@ -42,6 +42,7 @@
amavisd_usr=kolab
# @l_rgrp@
amavisd_grp=kolab-r
+amavisd_rpm=amavisd
fsl_logfile=${localstatedir}/fsl/fsl.log
@@ -75,6 +76,7 @@
emailserver_grp=kolab-r
# @l_musr@
emailserver_mail_usr=kolab
+emailserver_rpm=postfix
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
@@ -99,11 +101,16 @@
imap_spool=${imap_statedir}/spool
imap_sievedir=${imap_statedir}/sieve
imap_lmtp=${imap_statedir}/lmtp
+imap_rpm=imapd
kolab_statedir=${localstatedir}/kolab
kolab_logdir=${kolab_statedir}/log
kolab_pidfile=${kolab_statedir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+kolab_rpm=kolabd
+kolab_resource_handlers_rpm=kolab-resource-handlers
+kolab_webadmin_rpm=kolab-webadmin
+perl_kolab_rpm=perl-kolab
ldapserver_statedir=${localstatedir}/openldap
ldapserver_dir=${ldapserver_statedir}/openldap-data
@@ -139,6 +146,7 @@
webserver_musr=kolab
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}
+webserver_rpm=apache
phplibdir=${libdir}/php
phplibdir2=${kolab_statedir}/php
@@ -166,5 +174,3 @@
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
backupdir=${sysconfdir}/kolab
-
-
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- suse 16 Jan 2006 11:38:22 -0000 1.22
+++ suse 17 Jan 2006 19:20:17 -0000 1.23
@@ -30,6 +30,7 @@
amavisd_rusr=vscan
amavisd_usr=root
amavisd_grp=root
+amavisd_rpm=amavisd-new
fsl_logfile=${localstatedir}/log/fsl
@@ -58,6 +59,7 @@
emailserver_musr=maildrop
emailserver_grp=root
emailserver_mail_usr=maildrop
+emailserver_rpm=postfix
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/log/proftpd.log
@@ -80,11 +82,16 @@
imap_spool=${localstatedir}/spool/imap
imap_sievedir=${localstatedir}/lib/sieve
imap_lmtp=${imap_statedir}/lmtp
+imap_rpm=cyrus-imapd
kolab_statedir=${localstatedir}/kolab
kolab_logdir=${localstatedir}/log
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+kolab_rpm=kolab
+kolab_resource_handlers_rpm=kolab-resource-handlers
+kolab_webadmin_rpm=kolab-webadmin
+perl_kolab_rpm=perl-kolab
ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
@@ -116,6 +123,7 @@
webserver_musr=wwwrun
webserver_usr=wwwrun
webserver_grp=www
+webserver_rpm=apache2
phplibdir=${datadir}/php
phplibdir2=${datadir}/php
@@ -153,4 +161,3 @@
/etc/postfix/virtual \
/etc/sysconfig/ldap \
/etc/sysconfig/saslauthd
-
More information about the commits
mailing list