- take db user and name from configuration a build DBCS string from it

- construct jpps.external from jpps.internal

diff --git a/org.glite.deployment.jpps/config/scripts/glite-jpps-config.py b/org.glite.deployment.jpps/config/scripts/glite-jpps-config.py
index ec3ab7f..3612d6b 100755 (executable)
--- a/org.glite.deployment.jpps/config/scripts/glite-jpps-config.py
+++ b/org.glite.deployment.jpps/config/scripts/glite-jpps-config.py
@@ -285,8 +285,6 @@ def loadDefaults(params):
 
     params['GLITE_LOCATION'] = "/opt/glite"
     params['mysql.root.password'] = ""
-    params['jpps.database.name'] = "jpps"
-    params['jpps.database.username'] = "jpps"
     params['mysql.max_allowed_packet'] = "17"
     params['jpps.serviceName'] = 'JP PS Server service at %s' % glib.fq_hostname
     params['jpps.serviceType'] = 'org.glite.jp.primary'
@@ -337,14 +335,14 @@ def set_env():
         os.mkdir(os.environ['GLITE_JP_PRIMARY_INTERNAL'],0755)
     import socket
     glib.export('GLITE_JP_PRIMARY_EXTERNAL',"gsiftp://%s:%s%s" % (socket.getfqdn(socket.gethostname()), params['jpps.ftp.port'], params['jpps.internal']) )    
-    if not os.path.exists(params['jpps.external']):
-        os.mkdir(params['jpps.external'],0755)
+    if not os.path.exists(params['jpps.internal']):
+        os.mkdir(params['jpps.internal'],0755)
     #glite_setenv.sh does not like variables with spaces, 
     #and su don't like variables with "  
     #glib.export('GLITE_JP_DEBUG',params['jpps.debug'])    
     os.environ['GLITE_JP_DEBUG']='%s' % params['jpps.debug']
     glib.export('GLITE_JP_PRIMARY_PORT',params['jpps.port'])    
-    glib.export('GLITE_JP_PRIMARY_DBCS',params['jpps.dbcs'])    
+    glib.export('GLITE_JP_PRIMARY_DBCS',"%s/@localhost:%s" % (params['jpps.database.username'], params['jpps.database.name']) )    
     glib.export('GLITE_JP_PRIMARY_PIDFILE',params['jpps.pid.file'])    
 
     # Set environment

diff --git a/org.glite.deployment.jpps/config/templates/glite-jpps.cfg.xml b/org.glite.deployment.jpps/config/templates/glite-jpps.cfg.xml
index 55b2888..c4a71fe 100644 (file)
--- a/org.glite.deployment.jpps/config/templates/glite-jpps.cfg.xml
+++ b/org.glite.deployment.jpps/config/templates/glite-jpps.cfg.xml
@@ -66,10 +66,15 @@
                        description="non-default JP PS port"
                        value=""/>
 
-               <jpps.dbcs
-                       description="non-default JP PS DB contact string
-                       default: jpps/@localhost:jpps"
-                       value=""/>
+               <jpps.database.username
+                       description="JP PS database user
+                       default: jpps"
+                       value="jpps"/>
+
+               <jpps.database.name
+                       description="JP PS database name
+                       default: jpps"
+                       value="jpps"/>
 
                <jpps.pid.file
                        description="non-default JP PS pidfile ($GLITE_LOCATION_VAR/glite-jp-primarystoraged.pid)"

diff --git a/org.glite.deployment.jpps/project/version.properties b/org.glite.deployment.jpps/project/version.properties
index b6ff6e2..809be8c 100644 (file)
--- a/org.glite.deployment.jpps/project/version.properties
+++ b/org.glite.deployment.jpps/project/version.properties
@@ -1,4 +1,4 @@
 
 module.version = 2.2.0
-module.age = 1
-                               
\ No newline at end of file
+module.age = 2
+