diff options
| author | Christina Fu <cfu@redhat.com> | 2014-06-03 16:42:10 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2014-06-04 10:29:09 -0700 |
| commit | e1809a3c6df50ed2e8a35ab7108a3a057e4fcaff (patch) | |
| tree | 666e03d865ac966f0a36ab1aeed3fe1c25b52e00 /base/server | |
| parent | 5b7c76832dc72c85d9dd9db16f861f3283fa7eb0 (diff) | |
| download | pki-e1809a3c6df50ed2e8a35ab7108a3a057e4fcaff.tar.gz pki-e1809a3c6df50ed2e8a35ab7108a3a057e4fcaff.tar.xz pki-e1809a3c6df50ed2e8a35ab7108a3a057e4fcaff.zip | |
TPS Token Profile Resolver Framework - part2
Diffstat (limited to 'base/server')
| -rw-r--r-- | base/server/etc/default.cfg | 1 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 4 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 9f6859b76..87c197baa 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -607,6 +607,7 @@ pki_import_shared_secret=False pki_share_db=True pki_share_dbuser_dn=uid=pkidbuser,ou=people,o=%(pki_instance_name)s-CA pki_source_phone_home_xml=/usr/share/pki/%(pki_subsystem_type)s/conf/phoneHome.xml +pki_source_registry_cfg=%(pki_source_conf_path)s/registry.cfg # Paths # These are used in the processing of pkispawn and are not supposed diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index 8fb29dedc..2759ceeef 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -712,6 +712,10 @@ class PKIConfigParser: ['pki_subsystem_configuration_path'], "transportCert.profile") elif self.pki_master_dict['pki_subsystem'] == "TPS": + self.pki_master_dict['pki_target_registry_cfg'] = \ + os.path.join(self.pki_master_dict\ + ['pki_subsystem_configuration_path'], + "registry.cfg") self.pki_master_dict['pki_target_phone_home_xml'] = \ os.path.join( self.pki_master_dict['pki_subsystem_configuration_path'], 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 1c13bdbd1..88bdf94b7 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -94,6 +94,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): 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_registry_cfg'], + deployer.master_dict['pki_target_registry_cfg']) + 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 |