From: Zdeněk Salvet <salvet@ics.muni.cz>
Date: Wed, 8 Dec 2004 12:48:35 +0000 (+0000)
Subject: Use separate cert/key files again.
X-Git-Tag: glite-wms-utils-exception_R_1_0_0~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bc0434a01f03a98c52c0fa3efb4ec9fd7109f025;p=jra1mw.git

Use separate cert/key files again.
---

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index d8891d3..6d30b9f 100755
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -25,11 +25,9 @@ start()
 		creds="-c $GLITE_HOST_CERT -k $GLITE_HOST_KEY"
 
 	if test -z "$creds"; then
-		if su - $GLITE_USER -c "test -r /etc/grid-security/hostkey.pem"; then
+		if su - $GLITE_USER -c "test -r /etc/grid-security/hostkey.pem -a -r /etc/grid-security/hostcert.pem"; then
 			echo "$0: WARNING: /etc/grid-security/hostkey.pem readable by $GLITE_USER"
-			echo "$0:          creating $cred_copy from it"
-			su - $GLITE_USER -c "umask 077; cat /etc/grid-security/hostcert.pem /etc/grid-security/hostkey.pem >$cred_copy"
-			creds="-c $cred_copy -k $cred_copy"
+			creds="-c /etc/grid-security/hostcert.pem -k /etc/grid-security/hostkey.pem"
 		fi
 	fi