thomas: server/perl-kolab/sbin kolab_bootstrap.in,1.6,1.7

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/perl-kolab/sbin
In directory doto:/tmp/cvs-serv28097/perl-kolab/sbin

Modified Files:
	kolab_bootstrap.in 
Log Message:
kolab/issue3407 (kolab_bootstrap: improve message about importing the CA certificate)

Additionally copy the generated CA certificate to the location specified by
kolab_cafile to kolab.globals (world readable and with a file name for easy
import by web browsers)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab_bootstrap.in	10 Feb 2009 13:39:55 -0000	1.6
+++ kolab_bootstrap.in	18 Feb 2009 11:44:12 -0000	1.7
@@ -641,18 +641,23 @@
 EOS
     kolab_system("$Kolab::config{'kolab_scriptsdir'}/kolab_ca.sh -newca $fqdn");
     kolab_system("$Kolab::config{'kolab_scriptsdir'}/kolab_ca.sh -newkey $fqdn @CONFIG_DIR@/key.pem");
-    kolab_system("$Kolab::config{'kolab_scriptsdir'}/kolab_ca.sh -newreq $fqdn @CONFIG_DIR@/key.pem @CONFIG_DIR@/newreq.pem ");
+    kolab_system("$Kolab::config{'kolab_scriptsdir'}/kolab_ca.sh -newreq $fqdn @CONFIG_DIR@/key.pem @CONFIG_DIR@/newreq.pem");
     kolab_system("$Kolab::config{'kolab_scriptsdir'}/kolab_ca.sh -sign @CONFIG_DIR@/newreq.pem @CONFIG_DIR@/cert.pem");
-    kolab_system("chgrp $Kolab::config{'pki_grp'} @CONFIG_DIR@/key.pem;");
-    kolab_system("chmod 0640 @CONFIG_DIR@/key.pem;");
-    kolab_system("chgrp $Kolab::config{'pki_grp'} @CONFIG_DIR@/cert.pem;");
-    kolab_system("chmod 0640 @CONFIG_DIR@/cert.pem;");
-    print <<'EOS';
-################################################################################
+    kolab_system("chgrp $Kolab::config{'pki_grp'} @CONFIG_DIR@/key.pem @CONFIG_DIR@/cert.pem");
+    kolab_system("chmod 0640 @CONFIG_DIR@/key.pem @CONFIG_DIR@/cert.pem");
+    my $cafile = $Kolab::config{'kolab_cafile'};
+    if ($cafile eq '') {
+      $cafile = "@CONFIG_DIR@/ca/cacert.pem";
+    } else {
+      kolab_system("cp @CONFIG_DIR@/ca/cacert.pem $cafile && chmod 0644 $cafile");
+    }
+    print <<EOS;
 CA and certificate creation complete.
 
-You can install @CONFIG_DIR@/ca/cacert.pem on your clients to allow them
-to verify the validity of your server certificates.
+################################################################################
+# Please import $cafile on your clients
+# to allow them to verify the validity of your server certificates.
+################################################################################
 
 EOS
   }