richard: server/kolabd/kolabd ChangeLog, 1.28, 1.29 kolab_bootstrap.in, 1.12, 1.13

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
* dist_conf/debian: added (provided by  Benoit Mortier)
* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
  Added webserver_web_prefix to the url that is to be used to reach
  the admin page



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	31 Dec 2005 08:38:18 -0000	1.28
+++ ChangeLog	1 Jan 2006 21:20:24 -0000	1.29
@@ -1,3 +1,11 @@
+2006-01-01 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos, see issue1049
+	* dist_conf/debian: added (provided by  Benoit Mortier)
+	* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
+	* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
+	  Added webserver_web_prefix to the url that is to be used to reach
+	  the admin page
+
 2005-12-30 Richard Bos <richard at radoeka.nl>
 	* configure.ac: cosmetic change.  Change --enable-openpkg
 	  into --with-openpkg

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_bootstrap.in	30 Dec 2005 10:25:21 -0000	1.12
+++ kolab_bootstrap.in	1 Jan 2006 21:20:24 -0000	1.13
@@ -215,7 +215,7 @@
   }
   print "Creating backup of old configuration (LDAP, kolab.conf and certificates\n";
   my $epochseconds = timelocal(gmtime);
-  my $backupdir="@sysconfdir@/kolab/backup".$epochseconds;
+  my $backupdir="@backupdir@/backup".$epochseconds;
   mkdir($backupdir,0700) || die "cannot mkdir : $!";
   print "creating backup of LDAP repository\n";
   system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
@@ -909,4 +909,4 @@
 print "kolab is now ready to run!\n";
 print "please run '@KOLABRC@ rc all start'\n";
 print ("Use login=manager and passwd=$bind_pw when you log into\n");
-print ("the webinterface https://$fqdn/admin !\n");
+print ("the webinterface https://$fqdn@webserver_web_prefix@/admin !\n");