richard: server/kolabd/kolabd/dist_conf suse, 1.69, 1.70 common, 1.43, 1.44 centos-clarkconnect, 1.7, 1.8 kolab, 1.54, 1.55

cvs at kolab.org cvs at kolab.org
Wed Feb 13 23:59:51 CET 2008


Author: richard

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

Modified Files:
	suse common centos-clarkconnect kolab 
Log Message:
Changed the rpm suffix _rpm to _pkg so it better describes what it refers to,
also for platforms that use another package management system.
Added the variable kolab_pkgs to add more packages if needed.  This variable
is used in the kolab-webadmin package



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- suse	12 Feb 2008 15:43:20 -0000	1.69
+++ suse	13 Feb 2008 22:59:49 -0000	1.70
@@ -32,7 +32,7 @@
 amavisd_rusr=vscan
 amavisd_usr=root
 amavisd_grp=root
-amavisd_rpm=amavisd-new
+amavisd_pkg=amavisd-new
 
 fsl_logfile=${localstatedir}/log/fsl
 
@@ -63,7 +63,7 @@
 emailserver_setgid_grp=maildrop
 emailserver_default_privs=kolab
 emailserver_master_usr=kolab
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 emailserver_tables_usr=root
 
 imap_confdir=${sysconfdir}
@@ -77,24 +77,24 @@
 imap_sievedir=${localstatedir}/lib/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_rpm=cyrus-imapd
+imap_pkg=cyrus-imapd-kolab
 
 kolab_statedir=${localstatedir}/lib/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
+kolab_pkg=kolab
+kolab_pkgs=spamassassin openldap2 clamav
+kolab_webadmin_pkg=kolab-webadmin
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=root
 kolab_scriptsdir=$(datadir)/kolab/scripts
-kolab-filter_rpm=kolab-filter
-kolab-freebusy_rpm=kolab-freebusy
-perl_kolab_rpm=perl-kolab
-perl-kolab-conf=perl-kolab-conf
-php-pear-kolab_filter_rpm=php5-pear-kolab_filter
-php-pear-kolab_freebusy_rpm=php5-pear-kolab_freebusy
+kolab-filter_pkg=kolab-filter
+kolab-freebusy_pkg=kolab-freebusy
+perl_kolab_pkg=perl-kolab
+perl-kolab-conf_pkg=perl-kolab-conf
+php-pear-kolab_filter_pkg=php5-pear-kolab_filter
+php-pear-kolab_freebusy_pkg=php5-pear-kolab_freebusy
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just
@@ -135,7 +135,7 @@
 webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www
-webserver_rpm=apache2
+webserver_pkg=apache2
 
 phpini_dir=${sysconfdir}/php5/cli
 phplibdir=${datadir}/php5

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- common	11 Feb 2008 21:11:54 -0000	1.43
+++ common	13 Feb 2008 22:59:49 -0000	1.44
@@ -26,7 +26,7 @@
 	-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_pkg[@],$(amavisd_pkg),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
@@ -49,7 +49,7 @@
 	-e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
 	-e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
-	-e 's,[@]emailserver_rpm[@],$(emailserver_rpm),g' \
+	-e 's,[@]emailserver_pkg[@],$(emailserver_pkg),g' \
 	-e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
@@ -72,13 +72,13 @@
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
 	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
 	-e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
-	-e 's,[@]imap_rpm[@],$(imap_rpm),g' \
+	-e 's,[@]imap_pkg[@],$(imap_pkg),g' \
 	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
-	-e 's,[@]kolab-filter_rpm[@],$(kolab-filter_rpm),g' \
-	-e 's,[@]kolab-freebusy_rpm[@],$(kolab-freebusy_rpm),g' \
+	-e 's,[@]kolab-filter_pkg[@],$(kolab-filter_pkg),g' \
+	-e 's,[@]kolab-freebusy_pkg[@],$(kolab-freebusy_pkg),g' \
 	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -89,7 +89,8 @@
 	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
-	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
+	-e 's,[@]kolab_pkg[@],$(kolab_pkg),g' \
+	-e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
 	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
@@ -97,7 +98,7 @@
 	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),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,[@]kolab_webadmin_pkg[@],$(kolab_webadmin_pkg),g' \
 	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
 	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
@@ -112,10 +113,10 @@
 	-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,[@]perl-kolab-conf_rpm[@],$(perl-kolab-conf_rpm),g' \
-	-e 's,[@]php-pear-kolab_filter_rpm[@],$(php-pear-kolab_filter_rpm),g' \
-	-e 's,[@]php-pear-kolab_freebusy_rpm[@],$(php-pear-kolab_freebusy_rpm),g' \
+	-e 's,[@]perl_kolab_pkg[@],$(perl_kolab_pkg),g' \
+	-e 's,[@]perl-kolab-conf_pkg[@],$(perl-kolab-conf_pkg),g' \
+	-e 's,[@]php-pear-kolab_filter_pkg[@],$(php-pear-kolab_filter_pkg),g' \
+	-e 's,[@]php-pear-kolab_freebusy_pkg[@],$(php-pear-kolab_freebusy_pkg),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
@@ -139,7 +140,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_pkg[@],$(webserver_pkg),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: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- centos-clarkconnect	17 Oct 2007 17:57:13 -0000	1.7
+++ centos-clarkconnect	13 Feb 2008 22:59:49 -0000	1.8
@@ -60,7 +60,7 @@
 amavisd_rusr=amavis
 amavisd_usr=root
 amavisd_grp=amavis
-amavisd_rpm=amavisd-new
+amavisd_pkg=amavisd-new
 
 # TODO: what is this? 
 fsl_logfile=/var/log/fsl/fsl.log
@@ -104,7 +104,7 @@
 emailserver_setgid_grp=postdrop
 emailserver_default_privs=nobody
 emailserver_master_usr=kolab-n
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 
 # TODO: is this still used?
 emailserver_musr=is_this_still_used
@@ -124,7 +124,7 @@
 imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${localstatedir}/lib/imap/sieve
 imap_lmtp=${imap_statedir}/socket/lmtp
-imap_rpm=cyrus-imapd
+imap_pkg=cyrus-imapd
 
 #--------------------------------------------------------------------
 # Kolab
@@ -140,10 +140,9 @@
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/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
+kolab_pkg=kolabd
+kolab_webadmin_pkg=kolab-webadmin
+perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=filter
 kolab_scriptsdir=${datadir}/kolab/scripts
@@ -193,7 +192,7 @@
 webserver_musr=kolab
 webserver_usr=root
 webserver_grp=root
-webserver_rpm=httpd
+webserver_pkg=httpd
 webserver_confdir=/usr/webconfig/etc
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_sslscache=/var/cache/mod_ssl/scache

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- kolab	27 Nov 2007 07:30:24 -0000	1.54
+++ kolab	13 Feb 2008 22:59:49 -0000	1.55
@@ -35,7 +35,7 @@
 amavisd_usr=${kolab_musr}
 # @l_rgrp@
 amavisd_grp=${kolab_rgrp}
-amavisd_rpm=amavisd
+amavisd_pkg=amavisd
 
 
 fsl_logfile=${localstatedir}/fsl/fsl.log
@@ -73,7 +73,7 @@
 emailserver_setgid_grp=${kolab_rgrp}
 emailserver_default_privs=${kolab_usr}
 emailserver_master_usr=${kolab_usr}
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 emailserver_tables_usr=${kolab_susr}
 
 imap_confdir=${sysconfdir}/imapd
@@ -89,17 +89,16 @@
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_rpm=imapd
+imap_pkg=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
+kolab_pkg=kolabd
+kolab_webadmin_pkg=kolab-webadmin
+perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
@@ -143,7 +142,7 @@
 webserver_musr=${kolab_musr}
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
-webserver_rpm=apache
+webserver_pkg=apache
 
 phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php





More information about the commits mailing list