diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-18 10:52:06 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-05-18 11:06:37 -0700 |
commit | 924403a14e92112c3c3d696319759b65eb57a30c (patch) | |
tree | ae097f21c022bd21b4c8b655a0030a8bef3953a3 /base/deploy/src/scriptlets/finalization.py | |
parent | 488480629da8cd7c7263fab9773ef5860ad12947 (diff) | |
download | pki-924403a14e92112c3c3d696319759b65eb57a30c.tar.gz pki-924403a14e92112c3c3d696319759b65eb57a30c.tar.xz pki-924403a14e92112c3c3d696319759b65eb57a30c.zip |
PKI Deployment Scriptlets
* Introduced concept of "admin-domain" originally as a
separate folder, and later incorporated this concept
into an optional instance prefix
* Revised definition of <pki_instance_id> to be identified
as "[<pki_admin_domain_name>-]<pki_instance_name>
* Changed NSS security database model from one shared
database by BOTH a single Tomcat AND single Apache instance
into one per Tomcat instance (shared by CA/KRA/OCSP/TKS) and
one per Apache instance (shared by RA/TPS)
* Altered Configuration 'scriptlet' to invoke Jython for
access to new Java configuration servlet
* Renamed various "scriptlets" to comply with this new layout
* Re-aligned code to account for revised layout documented at
http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
-rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index 9a3c23cb5..acf51391a 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -28,7 +28,7 @@ import pkimessages as log import pkiscriptlet -# PKI Deployment Instance Population Classes +# PKI Deployment Finalization Scriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 @@ -43,8 +43,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Save a timestamped copy of the installation manifest file filename = master['pki_root_prefix'] +\ config.PKI_DEPLOYMENT_REGISTRY_ROOT + "/" +\ - master['pki_instance_name'] + "/" +\ - master['pki_web_server'].lower() + "/" +\ + master['pki_instance_id'] + "/" +\ master['pki_subsystem'].lower() +"/" +\ "spawn" + "_" + "manifest" + "." +\ master['pki_timestamp'] + "." + "csv" @@ -59,7 +58,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Log final process messages config.pki_log.info(log.PKISPAWN_END_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_name'], + master['pki_instance_id'], extra=config.PKI_INDENTATION_LEVEL_0) if not config.pki_dry_run_flag: util.file.modify(master['pki_spawn_log'], silent=True) @@ -77,8 +76,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Save a timestamped copy of the updated manifest file filename = master['pki_root_prefix'] +\ config.PKI_DEPLOYMENT_REGISTRY_ROOT + "/" +\ - master['pki_instance_name'] + "/" +\ - master['pki_web_server'].lower() + "/" +\ + master['pki_instance_id'] + "/" +\ master['pki_subsystem'].lower() +"/" +\ "respawn" + "_" + "manifest" + "." +\ master['pki_timestamp'] + "." + "csv" @@ -93,7 +91,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # Log final process messages config.pki_log.info(log.PKIRESPAWN_END_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_name'], + master['pki_instance_id'], extra=config.PKI_INDENTATION_LEVEL_0) if not config.pki_dry_run_flag: util.file.modify(master['pki_respawn_log'], silent=True) @@ -104,7 +102,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): extra=config.PKI_INDENTATION_LEVEL_1) config.pki_log.info(log.PKIDESTROY_END_MESSAGE_2, master['pki_subsystem'], - master['pki_instance_name'], + master['pki_instance_id'], extra=config.PKI_INDENTATION_LEVEL_0) if not config.pki_dry_run_flag: util.file.modify(master['pki_destroy_log'], silent=True) |