svn commit: r1602957 - /uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install

[ch...@apache.org]

Author: challngr
Date: Mon Jun 16 18:50:26 2014
New Revision: 1602957

URL: http://svn.apache.org/r1602957
Log:
UIMA-3892 Update keystore location after move to private place.

Modified:
    uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1602957&r1=1602956&r2=1602957&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install Mon Jun 16 18:50:26 2014
@@ -91,7 +91,7 @@ class PostInstall(DuccUtil):
         cmd = 'rm ' + keystore
         os.system(cmd);
 
-        pw  = self.ducc_properties.get('ducc.ws.port.ssl.pw')
+        pw  = self.ducc_private_properties.get('ducc.ws.port.ssl.pw')
         if ( pw == 'quackquack' ):
             print self.warn('The default ssl pw of ', pw, ' is configured. For security, change the property \n\tducc.ws.port.ssl.pw to a secure password in ducc.properties and rerun ducc_post_install.')
 
@@ -226,6 +226,9 @@ class PostInstall(DuccUtil):
         print 'Python version:'
         print sys.version
 
+        self.ducc_private_properties = DuccProperties()
+        self.ducc_private_properties.load(self.DUCC_HOME + '/resources/private/ducc.private.properties')
+
         py_version = sys.version_info
         if ( (py_version[0] != 2) or (py_version[1] < 4) ):
             self.fail("\nPython must be installed at level 2.4 or higher.")