richard: server/kolabd/kolabd ChangeLog, 1.49, 1.50 kolab_bootstrap.in, 1.19, 1.20

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
use @ldapserver_rgrp@ variable to determine the group for the files
key.pem and cert.pem




Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ChangeLog	17 Jan 2006 19:20:17 -0000	1.49
+++ ChangeLog	17 Jan 2006 19:49:18 -0000	1.50
@@ -1,6 +1,8 @@
 2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
-	* dist_conf/{common,kolab,suse}: introduced *_rpm variables
+	* dist_conf/{common,kolab,suse}: introduced *_rpm variables and
+	  ldapserver_rgrp variable.
+	* kolab_bootstrap.in: use @ldapserver_rgrp@ variable
 
 2006-01-16 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstrap.in: use @kolab_rgrp@ iso @kolab_rusr@ in chgrp

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolab_bootstrap.in	16 Jan 2006 21:47:20 -0000	1.19
+++ kolab_bootstrap.in	17 Jan 2006 19:49:18 -0000	1.20
@@ -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_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################
@@ -886,9 +886,9 @@
     kolab_system("scp $master_host:@sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/cert.pem");
     kolab_system("ssh -CA $master_host \"rm @sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/$fqdn-req.pem\"");
     die("Creation of @sysconfdir@/kolab/cert.pem failed") unless -f "@sysconfdir@/kolab/cert.pem";
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     
     print <<'EOS';