From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 22 Nov 2004 17:53:51 +0000 (+0000)
Subject: use /etc/grid-security/host{cert,key}.pem if readable
X-Git-Tag: glite-lb-client-interface_R_0_3_0~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=059d1c18140704d1186d965d2dd674d9d78cf58b;p=jra1mw.git

use /etc/grid-security/host{cert,key}.pem if readable
---

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 9050bd4..af0837b 100755
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -14,11 +14,22 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-$GLITE_LOCATION/var}
 
 unset creds port
 
+cred_copy=/var/tmp/glite-lb-logger.pem
+
 start()
 {
 	[ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&
 		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
+			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"
+		fi
+	fi
+
 	[ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
 
 	[ -n "$GLITE_LB_LOGGER_PORT" ] && port="-p $GLITE_LB_LOGGER_PORT"
@@ -41,6 +52,7 @@ stop()
 		echo -n Stopping glite-lb-interlogd ...
 		killall glite-lb-interlogd
 		echo " done"
+		rm -f $cred_copy
 }
 
 status()