Improved formatting
authorAlberto Di Meglio <alberto.di.meglio@cern.ch>
Wed, 2 Mar 2005 21:45:55 +0000 (21:45 +0000)
committerAlberto Di Meglio <alberto.di.meglio@cern.ch>
Wed, 2 Mar 2005 21:45:55 +0000 (21:45 +0000)
org.glite.deployment.lb/config/scripts/glite-lb-config.py
org.glite.deployment.lb/config/templates/glite-lb.cfg.xml

index 08a0b48..7a19f74 100644 (file)
@@ -186,9 +186,11 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
 
         pid = glib.getPID('rgma-servicetool')
         if (pid != 0):
-            print 'Could not stop the R-GMA Servicetool service            ', glib.printFailedMessage()
+            print 'Could not stop the R-GMA Servicetool service            ',
+            glib.printFailedMessage()
         else:
-            print 'The R-GMA Servicetool service has been stopped            ', glib.printOkMessage()
+            print 'The R-GMA Servicetool service has been stopped            ',
+            glib.printOkMessage()
         
         return 0
         
@@ -233,7 +235,8 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \
             
             file = open('/tmp/mysql_ct', 'w')
             text = ['CREATE DATABASE %s;\n' % params['lb.database.name'], 
-                       'GRANT ALL PRIVILEGES ON %s.* TO %s@localhost IDENTIFIED BY "";\n' % (params['lb.database.name'],params['lb.database.username']),
+                       'GRANT ALL PRIVILEGES ON %s.* TO %s@localhost IDENTIFIED BY "";\n' \
+                       % (params['lb.database.name'],params['lb.database.username']),
                        'USE %s;\n' % params['lb.database.name'],
                        '\. %s/etc/glite-lb-dbsetup.sql\n' % os.environ['GLITE_LOCATION']]
     
index 8577038..1576560 100644 (file)
                        value="lbserver20"/>
 
                <lb.index.list
-                        description="Definitions of indices on all the currently supported indexed system attributes">
-                        <value>owner</value>
-                        <value>location</value>
-                        <value>destination</value>
-                </lb.index.list>
+                       description="Definitions of indices on all the currently supported indexed system attributes">
+                       
+                       <value>owner</value>
+                       <value>location</value>
+                       <value>destination</value>
+
+               </lb.index.list>
                        
                <lb.database.username
                        description="The username to be used to access the local mySQL server
                <GLOBUS_LOCATION
                        description="The location of the Globus Toolkit"
                        value="/opt/globus"/>
+                       
        </parameters>
 
        <!--RGMA service publishing: log server -->
        <instance name="lb.rgma" service="rgma-servicetool">
                <parameters>
+               
                        <rgma.servicetool.enable
                                description="Publish log server via RGMA servicetool. If this variable is set to 'false': the other
-                                            values of this instance are not taken into account.[Example: 'true'] [Type: 'boolean']"
+                               values of this instance are not taken into account.[Example: 'true'] [Type: 'boolean']"
+                               
                                value="true"/>
-                        <rgma.servicetool.name
+                               
+                       <rgma.servicetool.name
                                description="RGMA servicetool variable: Name of the service. This should be globally unique.
-                                            [Example: 'your.host.name_lb'] [Type: 'String']"
-                                value="changeme"/>
+                               Example: your.host.name_lb
+                               [Type: 'String']"
+
+                               value="changeme"/>
 
-                        <rgma.servicetool.url_endpoint
+                       <rgma.servicetool.url_endpoint
                                description="RGMA servicetool variable: URL to contact the service at. 
-                                            This should be unique for each service. Use example and adapt host. 
-                                            [Example: 'http://your.host.name:0/LB/lbServer'] [Type: 'string']"
-                                value="changeme"/>
+                               This should be unique for each service. Use example and adapt host. 
+                               Example: http://your.host.name:0/LB/lbServer
+                               [Type: 'string']"
 
-                        <rgma.servicetool.service_type
+                               value="changeme"/>
+
+                       <rgma.servicetool.service_type
                                description="RGMA servicetool variable: The service type. This should be uniquely defined for 
-                                            each service type. Currently two methods of type naming are recommended:
-                                            (1) The targetNamespace from the WSDL document, followed by a space and then the service name.
-                                             (2) A URL owned by the body or individual who defines the service type.
-                                                   [Example: 'Logging and Bookkeeping Server'] [Type: 'string']"
-                                value="Logging and Bookkeeping Server"/>
+                               each service type. Currently two methods of type naming are recommended:
+                               (1) The targetNamespace from the WSDL document, followed by a space and then the service name.
+                               (2) A URL owned by the body or individual who defines the service type.
+                               Example: Logging and Bookkeeping Server
+                               [Type: 'string']"
+
+                               value="Logging and Bookkeeping Server"/>
 
-                        <rgma.servicetool.service_version
+                       <rgma.servicetool.service_version
                                description="RGMA servicetool variable: Service version in the form 'major.minor.patch'
-                                            [Example: '1.2.3'] [Type: 'string']"
-                                value="0.0.0"/>
+                               Example: 1.2.3
+                               [Type: 'string']"
 
-                        <rgma.servicetool.publish_interval
+                               value="0.0.0"/>
+
+                       <rgma.servicetool.publish_interval
                                description="RGMA servicetool variable: How often to check and publish service status.
-                                             [Example: '60'] [Type: 'string'] [Unit: 'seconds']"
-                                value="20"/>
+                               Example: 60
+                               [Type: 'string'] [Unit: 'seconds']"
+                               
+                               value="20"/>
 
                        <rgma.servicetool.status_script
-                                description="RGMA servicetool variable: Script to run when determining the service status. 
-                                            This script should return an exit code of 0 to indicate the service is OK, other values
-                                            should indicate an error. The first line of the standard output should be a brief message 
-                                            describing the service status (e.g. 'Accepting connections')
-                                             Example: '/opt/glite/etc/init.d/glite-lb-locallogger status'] [Type: 'string']"
-                                value="${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd status"/>
-
-                        <rgma.servicetool.status_interval
-                                description="RGMA servicetool variable: How often to check and publish service status.
-                                            [Example: '30'] [Type: 'string'] [Unit: 'seconds']"
-                                value="30"/>
+                               description="RGMA servicetool variable: Script to run when determining the service status. 
+                               This script should return an exit code of 0 to indicate the service is OK, other values
+                               should indicate an error. The first line of the standard output should be a brief message 
+                               describing the service status (e.g. 'Accepting connections')
+                               Example: ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd status
+                               [Type: 'string']"
+
+                               value="${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd status"/>
+
+                       <rgma.servicetool.status_interval
+                               description="RGMA servicetool variable: How often to check and publish service status.
+                               Example: 30
+                               [Type: 'string'] [Unit: 'seconds']"
+
+                               value="30"/>
 
                        <rgma.servicetool.url_wsdl
                                description="RGMA servicetool variable: URL of a WSDL document for the service (leave blank if the 
-                                            service has no WSDL).
-                                            [Example: 'http://example.rl.ac.uk/service?WSDL'] [Type: 'string']"
-                                value=""/>
-
-                        <rgma.servicetool.url_semantics
-                                description="RGMA servicetool variable: URL of a document containing a detailed description of the service
-                                            and how it should be used.
-                                            [Example: 'http://example.rl.ac.uk/service/semantics.html'] [Type: 'string']"
-                                value="n/a"/>
-                </parameters>
+                               service has no WSDL).
+                               Example: http://example.rl.ac.uk/service?WSDL
+                               [Type: 'string']"
+
+                               value=""/>
+
+                       <rgma.servicetool.url_semantics
+                               description="RGMA servicetool variable: URL of a document containing a detailed description of the service
+                               and how it should be used.
+                               Example: http://example.rl.ac.uk/service/semantics.html
+                               [Type: 'string']"
+
+                               value="n/a"/>
+
+               </parameters>
        </instance>
                                                
-               <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
-               <!-- System parameters - You should leave these alone -->
-               <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->               
+       <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
+       <!-- System parameters - You should leave these alone -->
+       <!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->               
 
 </config>