diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-07-28 18:59:30 -0700 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-07-30 23:51:19 -0400 |
commit | f589cc1e267d6d7b67a6463b4495b7a9c982669f (patch) | |
tree | 765428401ea3072d768b6d5f52f366e617bcc927 /base/deploy/src/scriptlets/instance_layout.py | |
parent | 2d427ce0008fb43ae9f6c02301ce6793a42904b9 (diff) | |
download | pki-f589cc1e267d6d7b67a6463b4495b7a9c982669f.tar.gz pki-f589cc1e267d6d7b67a6463b4495b7a9c982669f.tar.xz pki-f589cc1e267d6d7b67a6463b4495b7a9c982669f.zip |
PKI Deployment Scriptlets
* TRAC Ticket #263 - Dogtag 10: Fix 'pkidestroy' problem of sporadically "not"
removing "/etc/sysconfig/{pki_instance_id}" . . .
* TRAC Ticket #264 - Dogtag 10: Enable various other subsystems for
configuration . . .
* TRAC Ticket #261 - Dogtag 10: Revisit command-line options of 'pkispawn' and
'pkidestroy' . . .
* TRAC Ticket #268 - Dogtag 10: Create a parameter for optional restart of
configured PKI instance . . .
* TRAC Ticket #270 - Dogtag 10: Add missing parameters to
'pkideployment.cfg' . . .
* TRAC Ticket #265 - Dogtag 10: Provide configurable options for PKI client
information . . .
* TRAC Ticket #275 - Dogtag 10: Add debug information (comments) to Tomcat 7
"logging.properties"
* TRAC Ticket #276 - Dogtag 10: Relocate all 'pin' data to the 'sensitive'
dictionary
* TRAC Ticket #277 - Dogtag 10: Create an 'archive' for 'manifest' and
'pkideployment.cfg' files
* TRAC Ticket #278 - Dogtag 10: Fix Miscellaneous PKI Deployment Scriptlet
Issues . . .
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 7829e240c..013a960a6 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -34,15 +34,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): config.pki_log.info(log.INSTANCE_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - # establish instance base - util.directory.create(master['pki_instance_path']) # establish instance logs util.directory.create(master['pki_instance_log_path']) # establish instance configuration util.directory.create(master['pki_instance_configuration_path']) - # establish instance registry - util.directory.create(master['pki_instance_type_registry_path']) - util.directory.create(master['pki_instance_registry_path']) # establish Apache/Tomcat specific instance if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: # establish Tomcat instance base @@ -256,6 +251,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.delete(master['pki_instance_configuration_path']) # remove Tomcat instance registry util.directory.delete(master['pki_instance_type_registry_path']) + # remove PKI 'tomcat.conf' instance file + util.file.delete(master['pki_target_tomcat_conf_instance_id']) else: # ALWAYS display correct information (even during dry_run) if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and\ @@ -283,4 +280,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.delete(master['pki_instance_configuration_path']) # remove Tomcat instance registry util.directory.delete(master['pki_instance_type_registry_path']) + # remove PKI 'tomcat.conf' instance file + util.file.delete(master['pki_target_tomcat_conf_instance_id']) return self.rv |