richard: server/kolabd/kolabd/dist_conf common, 1.11, 1.12 suse, 1.13, 1.14

[cvs at intevation.de]

Author: richard

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

Modified Files:
	common suse 
Log Message:
* configure.ac: Added AC_SUBST(WITHOPENPKG)
* dist_conf/common: Added CHKCONFIG, WITHOPENPKG and backupfiles
* dist_conf/suse: Added assignment for backupfiles
* kolab_bootstrap.in: Added one time backup support for configuration
  files that are provided by the distributor
  Removed a redundant @ldapserver_dir@ statement
  Changed removal of *.pem files and the @ldapserver_dir@/* files
  Check the existance of files and directories, before moving
  Change @sysconfdir@/rc.conf for openpkg based distributions


It works very well on my (non openpkg) system.  Please test it on a
openpkg system carefully too!




Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- common	1 Jan 2006 21:20:24 -0000	1.11
+++ common	4 Jan 2006 22:03:59 -0000	1.12
@@ -11,11 +11,13 @@
 	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
 	-e 's,[@]phppeardir[@],$(phppeardir),g' \
 	-e 's,[@]BASH[@],$(BASHELL),g' \
+	-e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
+	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
-	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
-	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
+	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
+	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
@@ -23,6 +25,7 @@
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
 	-e 's,[@]backupdir[@],$(backupdir),g' \
+	-e 's,[@]backupfiles[@],$(backupfiles),g' \
 	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
 	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
 	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- suse	1 Jan 2006 21:20:24 -0000	1.13
+++ suse	4 Jan 2006 22:03:59 -0000	1.14
@@ -11,9 +11,9 @@
 kolab_susr=root
 
 BASHELL=/bin/bash
+KOLABRC=${sbindir}/kolab
 PERL=${bindir}/perl
 PHP=${bindir}/php
-KOLABRC=${sbindir}/kolab
 
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
@@ -137,3 +137,17 @@
 
 backupdir=${localstatedir}/adm/backup/kolab
 
+# One time backup files.  These original distribution configuration files
+# will be backed up once, just before kolab is about to change those files.
+backupfiles=/etc/amavisd.conf \
+	/etc/cyrus.conf \
+	/etc/imapd.conf \
+	/etc/openldap/slapd.conf \
+	/etc/postfix/main.cf \
+	/etc/postfix/master.cf \
+	/usr/lib/sasl2/smtpd.conf \
+	/etc/postfix/transport \
+	/etc/postfix/virtual \
+	/etc/sysconfig/ldap \
+	/etc/sysconfig/saslauthd
+