From: cvs2svn <admin@example.com>
Date: Sat, 11 Dec 2004 23:20:58 +0000 (+0000)
Subject: This commit was manufactured by cvs2svn to create tag 'glite-security-
X-Git-Tag: glite-security-proxyrenewal_R_0_1_0
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4d14d72a9f8e0cd31a43757a97aeaa301eaf1c9d;p=jra1mw.git

This commit was manufactured by cvs2svn to create tag 'glite-security-
proxyrenewal_R_0_1_0'.

Sprout from glite-security-proxyrenewal_branch_1_0_0_RC1 2004-12-11 23:20:57 UTC cvs2svn <admin@example.com> 'This commit was manufactured by cvs2svn to create branch 'glite-security-'
Cherrypick from master 2004-10-19 05:15:06 UTC Master Builder <glbuilder@cern.ch> 'Incremented build number [GLBUILDER]':
    org.glite.security.proxyrenewal/Makefile
    org.glite.security.proxyrenewal/build.xml
    org.glite.security.proxyrenewal/config/startup
    org.glite.security.proxyrenewal/project/version.properties
---

diff --git a/org.glite.security.proxyrenewal/Makefile b/org.glite.security.proxyrenewal/Makefile
index 539736d..f567f8a 100644
--- a/org.glite.security.proxyrenewal/Makefile
+++ b/org.glite.security.proxyrenewal/Makefile
@@ -30,7 +30,7 @@ distdir=.
 globalprefix=glite
 lbprefix=lb
 package=glite-security-proxyrenewal
-version=1.0.0
+version=0.0.0
 PREFIX=/opt/glite
 
 glite_location=$PREFIX
diff --git a/org.glite.security.proxyrenewal/build.xml b/org.glite.security.proxyrenewal/build.xml
index fcced8d..4d1ebf9 100755
--- a/org.glite.security.proxyrenewal/build.xml
+++ b/org.glite.security.proxyrenewal/build.xml
@@ -20,9 +20,6 @@
 
 	Revision history:
 	$Log$
-	Revision 1.3  2004/07/30 08:31:07  dimeglio
-	Changed default Ant target from compile to dist
-	
 	Revision 1.2  2004/07/12 16:18:37  dimeglio
 	Modified to use myproxy from the repository if available
 	
@@ -109,12 +106,5 @@
 	<target name="localclean"
 		description="Module specific cleaning tasks">
 	</target>
-
-	<!-- =========================================
-		 RPM settings
-	     ========================================= -->
-
-	<property name="build.package.summary" value="Proxy renewal daemon" />
-	<property name="build.package.description" value="The daemon is responsible for secure and controled way of periodical renewal&#xA;of users' proxy certificates. Its primary goal is to support long-time jobs&#xA;running on the grid. This package also contains a library and header file&#xA;that allow to develop C/C++ applications accessing the daemon." />
 	
 </project>		
diff --git a/org.glite.security.proxyrenewal/config/startup b/org.glite.security.proxyrenewal/config/startup
index db273c2..ff13d2d 100755
--- a/org.glite.security.proxyrenewal/config/startup
+++ b/org.glite.security.proxyrenewal/config/startup
@@ -1,30 +1,19 @@
 #!/bin/sh
 
 GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/opt/glite/var}
+GLITE_USER=${GLITE_USER:-glite}
+GLITE_LOCATION_VAR=$(GLITE_LOCATION_VAR:-/opt/glite/var}
 
 [ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
 [ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
 
 PROXY_REPOSITORY="$GLITE_LOCATION_VAR/spool/glite-renewd"
 
 start()
 {
-	if test -z "$GLITE_USER" ;then
-		echo 'Error: GLITE_USER is not set'
-		echo FAILED
-		return 1
-	fi
-
-	if [ -n "$GLITE_HOST_CERT" ]; then 
-		X509_USER_CERT="$GLITE_HOST_CERT"
-		export X509_USER_CERT
-	fi
-	if [ -n "$GLITE_HOST_KEY" ]; then
-		X509_USER_KEY="$GLITE_HOST_KEY"
-		export X509_USER_KEY
-	fi
+	[ -n "$GLITE_HOST_CERT" ] && X509_USER_CERT="$GLITE_HOST_CERT"
+	[ -n "$GLITE_HOST_KEY" ] && X509_USER_KEY="$GLITE_HOST_KEY"
+	export X509_USER_CERT X509_USER_KEY
 
 	echo -n Starting ProxyRenewal Daemon: glite-proxy-renewd ...
 
@@ -34,7 +23,7 @@ start()
 		chmod 0700 $PROXY_REPOSITORY
 	fi
 	
-	su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-proxy-renewd \
+	su $GLITE_USER -c "$GLITE_LOCATION/bin/glite-proxy-renewd \
 		-r $PROXY_REPOSITORY" && echo " done"
 }
 
diff --git a/org.glite.security.proxyrenewal/project/version.properties b/org.glite.security.proxyrenewal/project/version.properties
index 8e666ee..35fcb84 100644
--- a/org.glite.security.proxyrenewal/project/version.properties
+++ b/org.glite.security.proxyrenewal/project/version.properties
@@ -1,4 +1,4 @@
-#Sat Dec 11 02:59:12 CET 2004
-module.version=1.0.0
-module.build=105
+#Tue Oct 19 07:01:43 CEST 2004
+module.version=0.1.0
+module.build=45
 module.age=1