diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-04 20:29:35 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-07 11:28:10 -0700 |
| commit | 391d345b5a6a1a905e3db4105a65dd4fdd0d19a9 (patch) | |
| tree | cf73a152055f6bbc217c42bf8a8f0396ab3fd3dd /base/deploy/src/scriptlets/war_explosion.py | |
| parent | 9ad4d60592fdc37ae89672c29859b8463e183718 (diff) | |
| download | pki-391d345b5a6a1a905e3db4105a65dd4fdd0d19a9.tar.gz pki-391d345b5a6a1a905e3db4105a65dd4fdd0d19a9.tar.xz pki-391d345b5a6a1a905e3db4105a65dd4fdd0d19a9.zip | |
PKI Deployment Scriptlets
* Re-aligned code to account for revised layout documented at
http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment
* Massaged logic to comply with PKI subsystem running within
a shared instance
* Developed code to take advantage of a single shared NSS security
database model
* Completed the following two 'scriptlets':
* Dogtag 10: Python 'slot_assignment.py' Installation Scriptlet
(https://fedorahosted.org/pki/ticket/146)
* Dogtag 10: Python 'security_databases.py' Installation Scriptlet
(https://fedorahosted.org/pki/ticket/136)
* Created several additional PKI deployment helper utilities.
Diffstat (limited to 'base/deploy/src/scriptlets/war_explosion.py')
| -rw-r--r-- | base/deploy/src/scriptlets/war_explosion.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/base/deploy/src/scriptlets/war_explosion.py b/base/deploy/src/scriptlets/war_explosion.py index 4f235d8d7..1a89c9f7c 100644 --- a/base/deploy/src/scriptlets/war_explosion.py +++ b/base/deploy/src/scriptlets/war_explosion.py @@ -36,16 +36,16 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.WAR_EXPLOSION_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # deploy war file - util.directory.create(master['pki_webapps_subsystem_path']) + util.directory.create(master['pki_tomcat_webapps_subsystem_path']) util.war.explode(master['pki_war'], - master['pki_webapps_subsystem_path']) + master['pki_tomcat_webapps_subsystem_path']) # establish convenience symbolic links - util.symlink.create(master['pki_webapps_webinf_classes_path'], - master['pki_webapps_subsystem_webinf_classes_link']) - util.symlink.create(master['pki_webapps_webinf_lib_path'], - master['pki_webapps_subsystem_webinf_lib_link']) + util.symlink.create(master['pki_tomcat_webapps_webinf_classes_path'], + master['pki_tomcat_webapps_subsystem_webinf_classes_link']) + util.symlink.create(master['pki_tomcat_webapps_webinf_lib_path'], + master['pki_tomcat_webapps_subsystem_webinf_lib_link']) # set ownerships, permissions, and acls - util.directory.set_mode(master['pki_webapps_subsystem_path']) + util.directory.set_mode(master['pki_tomcat_webapps_subsystem_path']) return self.rv def respawn(self): @@ -53,17 +53,17 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.WAR_EXPLOSION_RESPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # redeploy war file - util.directory.modify(master['pki_webapps_subsystem_path']) + util.directory.modify(master['pki_tomcat_webapps_subsystem_path']) util.war.explode(master['pki_war'], - master['pki_webapps_subsystem_path']) + master['pki_tomcat_webapps_subsystem_path']) # update ownerships, permissions, and acls # NOTE: This includes existing convenience symbolic links - util.directory.set_mode(master['pki_webapps_subsystem_path']) + util.directory.set_mode(master['pki_tomcat_webapps_subsystem_path']) return self.rv def destroy(self): if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: config.pki_log.info(log.WAR_EXPLOSION_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - util.directory.delete(master['pki_webapps_subsystem_path']) + util.directory.delete(master['pki_tomcat_webapps_subsystem_path']) return self.rv |