From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 3 Feb 2013 10:20:53 +0000 (+0000)
Subject: YAIM-less deployment improvements (fetching CRL on Fedora, defaults for PX to perform... 
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c2965fd3ec53d13c3e9627aff1db76330fec16cb;p=jra1mw.git

YAIM-less deployment improvements (fetching CRL on Fedora, defaults for PX to perform setup out-of-the-box).
---

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 6199414..eb2c692 100755
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -646,12 +646,15 @@ fi
 
 if test "$setup_crl" = "1"; then
 	if test -x /usr/sbin/fetch-crl; then
-		if egrep -i "Debian|Ubuntu" /etc/issue >/dev/null; then
-			:
-		else
-			/sbin/service fetch-crl-cron start
-			/sbin/chkconfig fetch-crl-cron on
-		fi
+@debian@		# additional fetch-crl setup not needed
+@redhat@		/sbin/chkconfig fetch-crl-boot on
+@redhat@		/sbin/chkconfig fetch-crl-cron on
+@redhat@		/sbin/service fetch-crl-boot start
+@redhat@		/sbin/service fetch-crl-cron start
+@fedora@		systemctl enable fetch-crl-boot.service
+@fedora@		systemctl enable fetch-crl-cron.service
+@fedora@		systemctl start fetch-crl-boot.service
+@fedora@		systemctl start fetch-crl-cron.service
 	else
 		echo "glite-lb-setup: WARNING: fetch-crl not found, fetching won't be configured"
 	fi
diff --git a/org.glite.px.proxyrenewal/config/setup b/org.glite.px.proxyrenewal/config/setup
index 33aa098..5dd5e94 100755
--- a/org.glite.px.proxyrenewal/config/setup
+++ b/org.glite.px.proxyrenewal/config/setup
@@ -130,12 +130,15 @@ fi
 
 if test "$setup_crl" = "1"; then
 	if test -x /usr/sbin/fetch-crl; then
-		if egrep -i "Debian|Ubuntu" /etc/issue >/dev/null; then
-			:
-		else
-			/sbin/service fetch-crl-cron start
-			/sbin/chkconfig fetch-crl-cron on
-		fi
+@debian@		# additional fetch-crl setup not needed
+@redhat@		/sbin/chkconfig fetch-crl-boot on
+@redhat@		/sbin/chkconfig fetch-crl-cron on
+@redhat@		/sbin/service fetch-crl-boot start
+@redhat@		/sbin/service fetch-crl-cron start
+@fedora@		systemctl enable fetch-crl-boot.service
+@fedora@		systemctl enable fetch-crl-cron.service
+@fedora@		systemctl start fetch-crl-boot.service
+@fedora@		systemctl start fetch-crl-cron.service
 	else
 		echo "$NAME: WARNING: fetch-crl not found, fetching won't be configured"
 	fi
diff --git a/org.glite.px.proxyrenewal/config/startup b/org.glite.px.proxyrenewal/config/startup
index e261cdb..09c24f5 100755
--- a/org.glite.px.proxyrenewal/config/startup
+++ b/org.glite.px.proxyrenewal/config/startup
@@ -32,6 +32,10 @@
 GLITE_LOCATION=${GLITE_LOCATION:-'@glite_prefix@'}
 GLITE_LOCATION_ETC=${GLITE_LOCATION_ETC:-'@glite_etc@'}
 GLITE_PX_LOCATION_VAR=${GLITE_PX_LOCATION_VAR:-'@glite_var@'}
+GLITE_USER=${GLITE_USER:-'glite'}
+GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6`
+GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"}
+GLITE_HOST_KEY=${GLITE_HOST_KEY:-"$GLITE_HOME/.certs/hostkey.pem"}
 
 PROXY_REPOSITORY="$GLITE_PX_LOCATION_VAR/spool/glite-renewd"