Modified some parameters defaults

Added module.version param

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 dc63571..5abc998 100644 (file)
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py
+++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py
@@ -6,7 +6,7 @@
 # For license conditions see the license file or http://eu-egee.org/license.html
 #
 ################################################################################
-# glite-lb-config v. 1.2.2
+# glite-lb-config v. 1.2.3
 #
 # Post-installation script for configuring the gLite Logging and Bookkeping Server
 # Robert Harakaly < robert.harakaly@cern.ch >
@@ -42,9 +42,10 @@ class glite_lb:
     def __init__(self):
         self.mysql = MySQL.Mysql()
         self.verbose = 0
-        self.version = "1.2.2"
+        self.version = "1.2.3"
         self.name = "glite-lb"
         self.friendly_name = "gLite Logging and Bookkeeping"
+        params['module.version'] = self.version
         
     #-------------------------------------------------------------------------------
     # Banner 

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 747a6b4..ed39d97 100644 (file)
--- a/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
+++ b/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml
@@ -67,75 +67,65 @@
                                value="true"/>
                                
                        <rgma.servicetool.name
-                               description="RGMA servicetool variable: Name of the service. This should be globally unique.
-                               Example: your.host.name_Logging_Bookkeeping_Server
-                               [Type: 'String']"
-
-                               value="changeme"/>
+                               description="Name of the service. This should be globally unique.
+                                       Example: your.host.name_Logging_Bookkeeping_Server
+                                       [Type: 'String']"
+                               value="${HOSTNAME}_Logging_Bookkeeping_Server"/>
 
                        <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"/>
+                               description="URL to contact the service at. 
+                                       This should be unique for each service. Use example and adapt host. 
+                                       Example: http://your.host.name/LB/LBServer
+                                       [Type: 'string']"
+                               value="http://${HOSTNAME}/LB/LBServer"/>
 
                        <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']"
-
+                               description="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"/>
 
                        <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"/>
+                               description="Service version in the form 'major.minor.patch'
+                                       Example: 1.2.3
+                                       [Type: 'string']"
+                               value="${module.version}"/>
 
                        <rgma.servicetool.publish_interval
-                               description="RGMA servicetool variable: How often to check and publish service status.
-                               Example: 60
-                               [Type: 'string'] [Unit: 'seconds']"
-                               
-                               value="20"/>
+                               description="How often to check and publish service information.
+                                       Example: 3600 [Type: 'string'] [Unit: 'seconds']"
+                               value="3600"/>
 
                        <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: ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd status
-                               [Type: 'string']"
-
+                               description="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"/>
+                               description="How often to check and publish service status.
+                                       Example: 60 [Type: 'string'] [Unit: 'seconds']"
+                               value="60"/>
 
                        <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=""/>
+                               description="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="n/a"/>
 
                        <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']"
-
+                               description="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>

diff --git a/org.glite.deployment.lb/project/version.properties b/org.glite.deployment.lb/project/version.properties
index 4e52c78..0fdc5e4 100644 (file)
--- a/org.glite.deployment.lb/project/version.properties
+++ b/org.glite.deployment.lb/project/version.properties
@@ -1,4 +1,4 @@
 
-module.version = 1.2.2
+module.version = 1.2.3
 module.age = 1
                                
\ No newline at end of file