summaryrefslogtreecommitdiffstats
path: root/base/server/python
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-05-04 23:34:28 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-05-04 23:34:28 +0200
commit61ec70e0896360d80a85f7864c16edbf44787fb9 (patch)
treeb0d8dfa8a40571ff7aa0692f75f3b9204c25f4b9 /base/server/python
parenta31f24fcba558ea4efbfeb51b28f3e59e2281dfc (diff)
downloadpki-61ec70e0896360d80a85f7864c16edbf44787fb9.tar.gz
pki-61ec70e0896360d80a85f7864c16edbf44787fb9.tar.xz
pki-61ec70e0896360d80a85f7864c16edbf44787fb9.zip
Added existing database parameter.
Diffstat (limited to 'base/server/python')
-rw-r--r--base/server/python/pki/server/deployment/pkihelper.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 13a7755b8..1b2324f6d 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -4039,8 +4039,7 @@ class ConfigClient:
self.set_subca_security_domain(data)
# database
- if self.subsystem != "RA":
- self.set_database_parameters(data)
+ self.set_database_parameters(data)
# backup
if self.mdict['pki_instance_type'] == "Tomcat":
@@ -4391,25 +4390,33 @@ class ConfigClient:
self.mdict['pki_subordinate_security_domain_name'])
def set_database_parameters(self, data):
+
data.dsHost = self.mdict['pki_ds_hostname']
+
if config.str2bool(self.mdict['pki_ds_secure_connection']):
data.secureConn = "true"
data.dsPort = self.mdict['pki_ds_ldaps_port']
else:
data.secureConn = "false"
data.dsPort = self.mdict['pki_ds_ldap_port']
+
data.baseDN = self.mdict['pki_ds_base_dn']
data.bindDN = self.mdict['pki_ds_bind_dn']
data.database = self.mdict['pki_ds_database']
data.bindpwd = self.mdict['pki_ds_password']
+
+ data.existingDatabase = config.str2bool(self.mdict['pki_ds_existing_database'])
+
if config.str2bool(self.mdict['pki_ds_create_new_db']):
data.createNewDB = "true"
else:
data.createNewDB = "false"
+
if config.str2bool(self.mdict['pki_ds_remove_data']):
data.removeData = "true"
else:
data.removeData = "false"
+
if config.str2bool(self.mdict['pki_share_db']):
data.sharedDB = "true"
data.sharedDBUserDN = self.mdict['pki_share_dbuser_dn']