diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2013-05-16 13:06:14 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2013-06-10 13:35:22 -0400 |
| commit | 0812c8d7583250d9ccbfbc3439083d1d2296b2f5 (patch) | |
| tree | ed22e7a39a37ee87a36257170b00da7db11eca54 /base/server/src/scriptlets | |
| parent | e4656ce3f71f5cc0ba124ed5082a264e2689140b (diff) | |
| download | pki-0812c8d7583250d9ccbfbc3439083d1d2296b2f5.tar.gz pki-0812c8d7583250d9ccbfbc3439083d1d2296b2f5.tar.xz pki-0812c8d7583250d9ccbfbc3439083d1d2296b2f5.zip | |
Added Tomcat-based TPS instance.
The build and deployment tools have been modified to support creating
a basic Tomcat instance to run TPS. New configuration and template
files for TPS have been copied from another Tomcat subsystem. The TPS
functionality itself will be added in future patches.
Ticket #526
Diffstat (limited to 'base/server/src/scriptlets')
| -rw-r--r-- | base/server/src/scriptlets/configuration.py | 9 | ||||
| -rw-r--r-- | base/server/src/scriptlets/webapp_deployment.py | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/base/server/src/scriptlets/configuration.py b/base/server/src/scriptlets/configuration.py index 43f8c16cd..c13e7eba2 100644 --- a/base/server/src/scriptlets/configuration.py +++ b/base/server/src/scriptlets/configuration.py @@ -113,14 +113,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.PKI_CONFIG_NOT_YET_IMPLEMENTED_1, master['pki_subsystem'], extra=config.PKI_INDENTATION_LEVEL_2) - return rv - elif master['pki_subsystem'] == "TPS": - config.pki_log.info(log.PKI_CONFIG_NOT_YET_IMPLEMENTED_1, - master['pki_subsystem'], - extra=config.PKI_INDENTATION_LEVEL_2) - return rv + return self.rv elif master['pki_instance_type'] == "Tomcat": - # CA, KRA, OCSP, or TKS + # CA, KRA, OCSP, TKS, or TPS data = config_client.construct_pki_configuration_data() # Configure the substem diff --git a/base/server/src/scriptlets/webapp_deployment.py b/base/server/src/scriptlets/webapp_deployment.py index 4fdcc8614..aa52009fb 100644 --- a/base/server/src/scriptlets/webapp_deployment.py +++ b/base/server/src/scriptlets/webapp_deployment.py @@ -152,6 +152,9 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): elif master['pki_subsystem'] == "TKS": util.symlink.create(master['pki_tks_jar'], master['pki_tks_jar_link']) + elif master['pki_subsystem'] == "TPS": + util.symlink.create(master['pki_tps_jar'], + master['pki_tps_jar_link']) # set ownerships, permissions, and acls util.directory.set_mode(master['pki_tomcat_webapps_subsystem_path']) return self.rv |