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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | base/deploy/CMakeLists.txt | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/base/deploy/CMakeLists.txt b/base/deploy/CMakeLists.txt index f1bdafec4..44705818c 100644 --- a/base/deploy/CMakeLists.txt +++ b/base/deploy/CMakeLists.txt @@ -56,12 +56,15 @@ execute_process( ) install( FILES + src/scriptlets/configuration.jy src/scriptlets/configuration.py src/scriptlets/finalization.py + src/scriptlets/infrastructure_layout.py src/scriptlets/initialization.py src/scriptlets/instance_layout.py src/scriptlets/pkiconfig.py src/scriptlets/pkihelper.py + src/scriptlets/pkijython.py src/scriptlets/pkilogging.py src/scriptlets/pkimanifest.py src/scriptlets/pkimessages.py @@ -71,7 +74,6 @@ install( src/scriptlets/slot_substitution.py src/scriptlets/subsystem_layout.py src/scriptlets/war_explosion.py - src/scriptlets/webserver_layout.py DESTINATION ${PYTHON_SITE_PACKAGES}/pki/deployment PERMISSIONS @@ -114,13 +116,13 @@ foreach(TOMCAT_SUBSYSTEM ${TOMCAT_SUBSYSTEMS}) ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"${PYTHON_SITE_PACKAGES}/pki/deployment/instance_layout.py\" - \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/spawn/${TOMCAT_SUBSYSTEM}/010_instance_layout\")" + \"${PYTHON_SITE_PACKAGES}/pki/deployment/infrastructure_layout.py\" + \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/spawn/${TOMCAT_SUBSYSTEM}/010_infrastructure_layout\")" ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"${PYTHON_SITE_PACKAGES}/pki/deployment/webserver_layout.py\" - \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/spawn/${TOMCAT_SUBSYSTEM}/020_webserver_layout\")" + \"${PYTHON_SITE_PACKAGES}/pki/deployment/instance_layout.py\" + \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/spawn/${TOMCAT_SUBSYSTEM}/020_instance_layout\")" ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink @@ -170,16 +172,16 @@ foreach(TOMCAT_SUBSYSTEM ${TOMCAT_SUBSYSTEMS}) \"${PYTHON_SITE_PACKAGES}/pki/deployment/configuration.py\" \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/930_configuration\")" ) -# install(CODE "execute_process(COMMAND -# ${CMAKE_COMMAND} -E create_symlink -# \"${PYTHON_SITE_PACKAGES}/pki/deployment/slot_substitution.py\" -# \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/940_slot_substitution\")" -# ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${PYTHON_SITE_PACKAGES}/pki/deployment/war_explosion.py\" - \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/950_war_explosion\")" + \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/940_war_explosion\")" ) +# install(CODE "execute_process(COMMAND +# ${CMAKE_COMMAND} -E create_symlink +# \"${PYTHON_SITE_PACKAGES}/pki/deployment/slot_substitution.py\" +# \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/950_slot_substitution\")" +# ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${PYTHON_SITE_PACKAGES}/pki/deployment/subsystem_layout.py\" @@ -192,13 +194,13 @@ foreach(TOMCAT_SUBSYSTEM ${TOMCAT_SUBSYSTEMS}) ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"${PYTHON_SITE_PACKAGES}/pki/deployment/webserver_layout.py\" - \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/980_webserver_layout\")" + \"${PYTHON_SITE_PACKAGES}/pki/deployment/instance_layout.py\" + \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/980_instance_layout\")" ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"${PYTHON_SITE_PACKAGES}/pki/deployment/instance_layout.py\" - \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/990_instance_layout\")" + \"${PYTHON_SITE_PACKAGES}/pki/deployment/infrastructure_layout.py\" + \"\$ENV{DESTDIR}${DATA_INSTALL_DIR}/deployment/destroy/${TOMCAT_SUBSYSTEM}/990_infrastructure_layout\")" ) install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink |