added new parameter

diff --git a/org.glite.deployment.lb/config/glite-lb.cfg.xml b/org.glite.deployment.lb/config/glite-lb.cfg.xml
index 4bc1c2e..0c9049c 100644 (file)
--- a/org.glite.deployment.lb/config/glite-lb.cfg.xml
+++ b/org.glite.deployment.lb/config/glite-lb.cfg.xml
@@ -4,13 +4,15 @@
 
    <!-- host certificate -->
    <parameter name='certs'           value='true'/>
-   <parameter name='certs_path'      value='/etc/grid-security/certificates/'/>
-   <parameter name='hostcert'        value='/etc/grid-security/hostcert.pem'/>
-   <parameter name='hostkey'         value='/etc/grid-security/hostkey.pem'/>
+   <parameter name='certs_path'      value='/etc/grid-security/certificates'/>
+   <parameter name='host_cert_path'  value='/etc/grid-security'/>
+   <parameter name='hostcert'        value='hostcert.pem'/>
+   <parameter name='hostkey'         value='hostkey.pem'/>
 
    <!-- user account -->
    <parameter name='username'        value='glite'/>
    <parameter name='group_name'      value='glite'/>
+   <parameter name='user_cert_path'  value='.cert'/>
 
    <!-- env variables -->
    <parameter name='glite_location'  value='/opt/glite'/>
@@ -18,4 +20,5 @@
 
    <!-- MySQL DB -->
    <parameter name='db_name'         value='lbserver20'/>
+   <parameter name='db_user'         value='lbserver'/>
 </config>

diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config b/org.glite.deployment.lb/config/scripts/glite-lb-config
index dcd45f1..cbab571 100644 (file)
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config
@@ -42,13 +42,6 @@ def usage(msg='glite-lb-bkserverd start/stop/status'):
 #-------------------------------------------------------------------------------
 
 def set_env():
-   os.environ['GLITE_LOCATION']  = config['glite_location']
-   os.environ['GLOBUS_LOCATION'] = config['globus_location']
-   os.environ['LD_LIBRARY_PATH'] = '%s/lib:/%s/lib:$LD_LIBRARY_PATH' % (config['glite_location'], config['globus_location'])
-   os.environ['GLITE_HOST_KEY']  = config['hostkey']
-   os.environ['GLITE_HOST_CERT'] = config['hostcert']
-   os.environ['GLITE_CERT_DIR']  = config['certs_path']
-
    print '#-------------------------------------------------------------------'
    print 'Setting ENV variables in /root/.bashrc and /root/.profile'
    print '#-------------------------------------------------------------------'
@@ -56,16 +49,16 @@ def set_env():
    file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
    file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
    file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH]\n')
-   file.write('export GLITE_HOST_KEY=%s\n' % config['hostkey'])
-   file.write('export GLITE_HOST_CERT=%s\n' % config['hostcert'])
+   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
+   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
    file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
    file.close()
    file = open('/root/.profile', 'a')
    file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
    file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
    file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH]\n')
-   file.write('export GLITE_HOST_KEY=%s\n' % config['hostkey'])
-   file.write('export GLITE_HOST_CERT=%s\n' % config['hostcert'])
+   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
+   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
    file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
    file.close()
    print 'OK!\n'
@@ -77,16 +70,16 @@ def set_env():
    file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
    file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
    file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=%s\n' % config['hostkey'])
-   file.write('export GLITE_HOST_CERT=%s\n' % config['hostcert'])
+   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
+   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert'])) 
    file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
    file.close()
    file = open('/home/%s/.profile' % config['username'], 'a')
    file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
    file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
    file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=%s\n' % config['hostkey'])
-   file.write('export GLITE_HOST_CERT=%s\n' % config['hostcert'])
+   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
+   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
    file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
    file.close()
    os.system('/bin/chown %s:%s /home/%s/.bashrc' % (config['username'], config['group_name'], config['username']))
@@ -148,8 +141,8 @@ def check_certs():
    print 'Checking if the hostkey and hostcert are in the machine.'
    print '#-------------------------------------------------------------------'
 
-   hostcert = config['hostcert']
-   hostkey  = config['hostkey']
+   hostcert = '%s/%s' % (config['host_cert_path'], config['hostcert'])
+   hostkey  = '%s/%s' % (config['host_cert_path'], config['hostkey'])
    if not os.path.exists(hostcert):
       sys.exit("Error: Host certificate not found at %s" % hostcert)
    if not os.path.exists(hostkey) :
@@ -168,9 +161,10 @@ def configure():
    print '#-------------------------------------------------------------------'
    print ('Creating MySQL %s database.' % config['db_name'])
    print '#-------------------------------------------------------------------'
+   os.system('/usr/bin/mysqlaccess %s %s' % (config['db_user'], config['db_name']))
    file = open('/tmp/mysql_ct', 'w')
    file.write('CREATE DATABASE %s;\n' % config['db_name'])
-   file.write('GRANT ALL PRIVILEGES ON %s.* TO %s@localhost IDENTIFIED BY "";\n' % (config['db_name'], config['db_name']))
+   file.write('GRANT ALL PRIVILEGES ON %s.* TO %s@localhost IDENTIFIED BY "";\n' % (config['db_name'], config['db_user']))
    file.write('USE %s;\n' % config['db_name'])
    file.write('\. %s/etc/glite-lb-dbsetup.sql\n' % config['glite_location'])
    file.close()
@@ -200,11 +194,11 @@ def configure():
 
 
    # Copy the temporary glite-lb-bkserverd daemon in init.d
-   print '#-------------------------------------------------------------------'
-   print ('Updating %s/etc/init.d/glite-lb-bkserverd' % config['glite_location'])
-   print '#-------------------------------------------------------------------'
-   os.system('/bin/cp glite-lb-bkserverd-config %s/etc/init.d/glite-lb-bkserverd' % config['glite_location'])
-   print '\n'
+   # print '#-------------------------------------------------------------------'
+   # print ('Updating %s/etc/init.d/glite-lb-bkserverd' % config['glite_location'])
+   # print '#-------------------------------------------------------------------'
+   # os.system('/bin/cp glite-lb-bkserverd-config %s/etc/init.d/glite-lb-bkserverd' % config['glite_location'])
+   # print '\n'
 
 
    return 1
@@ -319,7 +313,7 @@ if __name__ == '__main__':
    
    # Set up the environment
    set_env()
-   check_env()
+   # check_env()
    print_env()
       
    # Print configuration parameters