richard: server/kolabd/kolabd ChangeLog, 1.63, 1.64 kolab_bootstrap.in, 1.20, 1.21 kolab_sslcert.sh.in, 1.2, 1.3

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in kolab_sslcert.sh.in 
Log Message:
introduced a new variable pki_grp for public key infrastructure (pki) support



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ChangeLog	7 Feb 2006 11:41:07 -0000	1.63
+++ ChangeLog	2 Mar 2006 20:40:37 -0000	1.64
@@ -1,5 +1,10 @@
-2006-02-07  Thomas Arendsen Hein  <thomas at intevation.de>
+2006-03-02 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* dist_conf/common, dist_conf/kolab, dist_conf/suse,
+	  kolab_bootstrap.in, kolab_sslcert.sh.in: introduced a new
+	  variable pki_grp for public key infrastructure (pki) group support.
 
+2006-02-07  Thomas Arendsen Hein  <thomas at intevation.de>
 	* dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
 	  to fix logrotate in OpenPKG installation (Issue1015).
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolab_bootstrap.in	17 Jan 2006 19:49:18 -0000	1.20
+++ kolab_bootstrap.in	2 Mar 2006 20:40:37 -0000	1.21
@@ -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 @ldapserver_rgrp@ @sysconfdir@/kolab/key.pem;");
+    kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
-    kolab_system("chgrp @ldapserver_rgrp@ @sysconfdir@/kolab/cert.pem;");
+    kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/cert.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
     print <<'EOS';
 ################################################################################

Index: kolab_sslcert.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_sslcert.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_sslcert.sh.in	14 Jan 2006 22:45:54 -0000	1.2
+++ kolab_sslcert.sh.in	2 Mar 2006 20:40:37 -0000	1.3
@@ -35,9 +35,9 @@
 		                   -config tmp.req.cnf >/dev/null 2>&1
 echo "done"
 
-chgrp @kolab_rgrp@ key.pem
+chgrp @pki_grp@ key.pem
 chmod 0640 key.pem
-chgrp @kolab_rgrp@ cert.pem
+chgrp @pki_grp@ cert.pem
 chmod 0640 cert.pem
 
 #rm -f tmp.req.cnf