diff options
Diffstat (limited to 'base/server/python')
-rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 15 | ||||
-rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 19 |
2 files changed, 33 insertions, 1 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 6d47a902b..fc57e3332 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -3248,6 +3248,10 @@ class ConfigClient: # Create system certs self.set_system_certs(data) + # TPS parameters + if self.master_dict['pki_subsystem'] == "TPS": + self.set_tps_parameters(data) + return data def set_system_certs(self, data): @@ -3461,6 +3465,17 @@ class ConfigClient: # External CA Step 2 data.stepTwo = "true" + def set_tps_parameters(self, data): + data.caUri = self.master_dict['pki_ca_uri'] + data.tksUri = self.master_dict['pki_tks_uri'] + data.enableServerSideKeyGen = self.master_dict['pki_enable_server_side_keygen'] + if config.str2bool(self.master_dict['pki_enable_server_side_keygen']): + data.kraUri = self.master_dict['pki_kra_uri'] + data.authdbHost = self.master_dict['pki_authdb_hostname'] + data.authdbPort = self.master_dict['pki_authdb_port'] + data.authdbBaseDN = self.master_dict['pki_authdb_basedn'] + data.authdbSecureConn = self.master_dict['pki_authdb_secure_conn'] + def create_system_cert(self, tag): cert = pki.system.SystemCertData() cert.tag = self.master_dict["pki_%s_tag" % tag] diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index be502bc01..8f03e5f2d 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -634,7 +634,6 @@ class PKIConfigParser: self.pki_master_dict['SYSTEM_LIBRARIES_SLOT'] = None self.pki_master_dict['SYSTEM_USER_LIBRARIES_SLOT'] = None self.pki_master_dict['TMP_DIR_SLOT'] = None - self.pki_master_dict['TPS_DIR_SLOT'] = None elif self.pki_master_dict['pki_subsystem'] in\ config.PKI_TOMCAT_SUBSYSTEMS: self.pki_master_dict['INSTALL_TIME_SLOT'] = \ @@ -826,6 +825,24 @@ class PKIConfigParser: "+TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA," + \ "+TLS_DHE_RSA_WITH_AES_128_CBC_SHA," + \ "+TLS_DHE_RSA_WITH_AES_256_CBC_SHA" + + # tps parameters + self.pki_master_dict['TOKENDB_HOST_SLOT'] = \ + self.pki_master_dict['pki_ds_hostname'] + + if config.str2bool(self.pki_master_dict['pki_ds_secure_connection']): + self.pki_master_dict['TOKENDB_PORT_SLOT'] = \ + self.pki_master_dict['pki_ds_ldaps_port'] + else: + self.pki_master_dict['TOKENDB_PORT_SLOT'] = \ + self.pki_master_dict['pki_ds_ldap_port'] + + self.pki_master_dict['TOKENDB_ROOT_SLOT'] = \ + self.pki_master_dict['pki_ds_base_dn'] + + self.pki_master_dict['TPS_DIR_SLOT'] = \ + self.pki_master_dict['pki_source_subsystem_path'] + if self.pki_master_dict['pki_subsystem'] == "CA": self.pki_master_dict['PKI_ENABLE_RANDOM_SERIAL_NUMBERS'] = \ self.pki_master_dict\ |