From 0abfe8ebbfe57d94b14f407db20d762d09999e5a Mon Sep 17 00:00:00 2001
From: Robert Harakaly <robert.harakaly@cern.ch>
Date: Tue, 7 Dec 2004 20:01:26 +0000
Subject: [PATCH] LB certificate setup

---
 org.glite.deployment.lb/config/scripts/glite-lb-config.py | 7 +++++--
 org.glite.deployment.lb/config/templates/glite-lb.cfg.xml | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config.py b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
index f854515..f6b81bc 100644
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
@@ -118,7 +118,8 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
         if params.has_key('dirlist'):
            dirlist = string.split(params['dirlist'],',')
            for d in dirlist:
-              gLib.check_dir(d,0777)
+              glib.check_dir(d,0777)
+        glib.check_dir(params['GLITE_CERT_DIR'])
          
         # Create the GLITE_USER if it doesn't exists
         print "Creating/Verifying the GLITE_USER account %s" % params['GLITE_USER']
@@ -128,7 +129,9 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
         
         # Copy certificates
         os.system("cp %s %s ~%s/.certs/" % (params['host.certificate.file'], params['host.key.file'], params['GLITE_USER']))
-                 
+        os.chown("/home/%s/.certs" % params['GLITE_USER'], params['GLITE_USER'])
+        os.chown("/home/%s/.certs/*" % params['GLITE_USER'], params['GLITE_USER'])
+                
         # Create the MySQL database
         self.mysql.stop()
         time.sleep(5)
diff --git a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
index 9caadb3..7161e14 100644
--- a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
+++ b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
@@ -44,6 +44,14 @@
 		<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
 		<!-- System parameters - You should leave these alone -->
 		<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
+		<lb.certificate.file
+			description="The host certificate (public key) file location"
+			value="/home/gproduct/.certs/hostcert.pem"/>
+		
+		<lb.key.file
+			description="The host certificate (private key) file location"
+			value="/home/gproduct/.certs/hostkey.pem"/>
+		
 		<dirlist value='/opt/glite/var'/>
 	</parameters>
 </config>
\ No newline at end of file
-- 
1.8.2.3