richard: server/kolabd/kolabd ChangeLog, 1.47, 1.48 kolab_bootstrap.in, 1.18, 1.19

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
Use @kolab_rgrp@ iso @kolab_rusr@ in chgrp command.
Revert the previous update; "use @ldapserver_usr@ instead of @kolab_musr@",
as it did not work as expected.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- ChangeLog	16 Jan 2006 11:38:22 -0000	1.47
+++ ChangeLog	16 Jan 2006 21:47:20 -0000	1.48
@@ -1,8 +1,15 @@
 2006-01-16 Richard Bos <richard at radoeka.nl>
-	Patch for  for non openpkg based distributions:
-	* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to alter the
-	  ownership of the files $pubreskey $privreskey on the master server.
-	* templates/session_vars.php.template.in: use @webserver_musr@ instead of @kolab_musr@
+	* kolab_bootstrap.in: use @kolab_rgrp@ iso @kolab_rusr@ in chgrp
+	  command.
+	* revert the previous update; use @ldapserver_usr@ instead of
+	  @kolab_musr@, as it did not work as expected.
+
+2006-01-16 Richard Bos <richard at radoeka.nl>
+	* kolab_bootstrap.in: use @ldapserver_usr@ instead of @kolab_musr@ to
+	  alter the ownership of the files $pubreskey $privreskey on the
+	  master server.
+	* templates/session_vars.php.template.in: use @webserver_musr@ instead
+	  of @kolab_musr@
 
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab_bootstrap.in	16 Jan 2006 11:38:22 -0000	1.18
+++ kolab_bootstrap.in	16 Jan 2006 21:47:20 -0000	1.19
@@ -668,7 +668,7 @@
     print "Creating RSA keypair for resource password encryption\n";
     kolab_system("@bindir@/openssl genrsa -out $privreskey 1024");
     kolab_system("@bindir@/openssl rsa -in $privreskey -pubout -out $pubreskey");
-    kolab_system("chown @ldapserver_usr@:@kolab_grp@ $pubreskey $privreskey");
+    kolab_system("chown @kolab_musr@:@kolab_grp@ $pubreskey $privreskey");
     chmod 0660, $privreskey, $pubreskey;
     #unlink( "dsa-params" );
     umask $oldmask;
@@ -699,9 +699,9 @@
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
-    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################