martin: server/kolabd/kolabd Makefile.am, 1.20, 1.21 kolab_bootstrap.in, 1.22, 1.23

[cvs at intevation.de]

Author: martin

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

Modified Files:
	Makefile.am kolab_bootstrap.in 
Log Message:
Martin Konold: Applied "Relocating scripts from /etc" from Gunnar Wrobel


Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	8 Feb 2006 20:29:31 -0000	1.20
+++ Makefile.am	9 Mar 2006 21:52:02 -0000	1.21
@@ -13,7 +13,7 @@
 # is sometimes used in this file
 kolabconfdir = $(sysconfdir)/kolab
 
-kolabdir = $(sysconfdir)/kolab
+kolabdir = $(kolab_scriptsdir)
 
 if OPENPKG
   KOLAB_SCRIPTS_FILES = kolab

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kolab_bootstrap.in	9 Mar 2006 21:40:05 -0000	1.22
+++ kolab_bootstrap.in	9 Mar 2006 21:52:02 -0000	1.23
@@ -700,10 +700,10 @@
 certificate. You will be prompted for a passphrase for the CA.
 ################################################################################
 EOS
-    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newca $fqdn");
-    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("@kolab_scriptsdir@/kolab_ca.sh -newca $fqdn");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
     kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/key.pem;");
     kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
     kolab_system("chgrp @pki_grp@ @sysconfdir@/kolab/cert.pem;");
@@ -883,11 +883,11 @@
 EOS
 
     # Create cert req
-    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("@kolab_scriptsdir@/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
+    kolab_system("@kolab_scriptsdir@/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
     # Log into master and sign cert request
     kolab_system("scp @sysconfdir@/kolab/newreq.pem $master_host:@sysconfdir@/kolab/$fqdn-req.pem");
-    kolab_system("ssh -CA $master_host \"@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/$fqdn-req.pem @sysconfdir@/kolab/$fqdn.pem;\"");
+    kolab_system("ssh -CA $master_host \"@kolab_scriptsdir@/kolab_ca.sh -sign @sysconfdir@/kolab/$fqdn-req.pem @sysconfdir@/kolab/$fqdn.pem;\"");
     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";