diff options
author | Jack Magne <jmagne@dhcp-16-213.sjc.redhat.com> | 2014-04-14 15:39:50 -0700 |
---|---|---|
committer | Jack Magne <jmagne@dhcp-16-213.sjc.redhat.com> | 2014-04-15 14:40:28 -0700 |
commit | 19664d23cf0808a25e736b97fb12144b60b84aba (patch) | |
tree | 6c53785ae12fdeca3ad5e6a039226f19746d0da2 /base/server/python/pki/server | |
parent | 32a0192af220f2b18f79a9231310fefd22182afb (diff) | |
download | pki-19664d23cf0808a25e736b97fb12144b60b84aba.tar.gz pki-19664d23cf0808a25e736b97fb12144b60b84aba.tar.xz pki-19664d23cf0808a25e736b97fb12144b60b84aba.zip |
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.
Diffstat (limited to 'base/server/python/pki/server')
-rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 6 | ||||
-rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 4 |
2 files changed, 10 insertions, 0 deletions
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): |