From 19664d23cf0808a25e736b97fb12144b60b84aba Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Mon, 14 Apr 2014 15:39:50 -0700 Subject: PhoneHome feature: 1. Provides an xml file served by TPS to allow the client(esc) to configure itself to contact TPS. 2. Edewata review fixes. Return application/xml instead of text/xml, and fix how the phone home file path is calculated. --- base/server/python/pki/server/deployment/pkiparser.py | 6 ++++++ .../python/pki/server/deployment/scriptlets/slot_substitution.py | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 8348648e5..b0e5fbcb1 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -711,6 +711,12 @@ class PKIConfigParser: os.path.join(self.pki_master_dict\ ['pki_subsystem_configuration_path'], "transportCert.profile") + elif self.pki_master_dict['pki_subsystem'] == "TPS": + self.pki_master_dict['pki_target_phone_home_xml'] = \ + os.path.join( + self.pki_master_dict['pki_subsystem_configuration_path'], + "phoneHome.xml") + # Slot assignment name/value pairs # NOTE: Master key == Slots key; Master value ==> Slots value self.pki_master_dict['PKI_INSTANCE_NAME_SLOT'] = \ diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py index cc54cc49c..1c13bdbd1 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -92,6 +92,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): deployer.master_dict['pki_target_proxy_conf']) deployer.file.apply_slot_substitution( deployer.master_dict['pki_target_profileselect_template']) + elif deployer.master_dict['pki_subsystem'] == "TPS": + deployer.file.copy_with_slot_substitution( + deployer.master_dict['pki_source_phone_home_xml'], + deployer.master_dict['pki_target_phone_home_xml']) return self.rv def destroy(self, deployer): -- cgit