Added direct deployment for all subsystems.

The deployment tool has been modified to deploy all subsystems
directly from the /usr/share/pki. This will simplify updating
the templates in the web applications.

https://fedorahosted.org/pki/ticket/499

3 files changed, 3 insertions, 114 deletions

diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 93473feaf..3d178ba7c 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -657,11 +657,6 @@ class PKIConfigParser:
                         self.mdict['pki_instance_configuration_path'],
                         "tomcat.conf")
                 # in-place slot substitution name/value pairs
-                self.mdict['pki_target_velocity_properties'] = \
-                    os.path.join(
-                        self.mdict['pki_tomcat_webapps_subsystem_path'],
-                        "WEB-INF",
-                        "velocity.properties")
                 self.mdict['pki_target_subsystem_web_xml'] = \
                     os.path.join(
                         self.mdict['pki_tomcat_webapps_subsystem_path'],
@@ -712,12 +707,6 @@ class PKIConfigParser:
                             self.mdict['pki_subsystem_configuration_path'],
                             "subsystemCert.profile")
                     # in-place slot substitution name/value pairs
-                    self.mdict['pki_target_profileselect_template'] = \
-                        os.path.join(
-                            self.mdict['pki_tomcat_webapps_subsystem_path'],
-                            "ee",
-                            self.mdict['pki_subsystem'].lower(),
-                            "ProfileSelect.template")
                     if config.str2bool(self.mdict['pki_profiles_in_ldap']):
                         self.mdict['PKI_PROFILE_SUBSYSTEM_SLOT'] = 'LDAPProfileSubsystem'
                     else:
diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
index f86ae4900..3baef04b9 100644
--- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
+++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py
@@ -70,15 +70,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                 deployer.mdict['pki_target_tomcat_conf'],
                 overwrite_flag=True)
 
-            # Configure web.xml and velocity.properties for each subsystem.
-            # For TPS this is not necessary since the files are no longer
-            # copied to the target location in the instance directory.
-            if deployer.mdict['pki_subsystem'] != "TPS":
-                deployer.file.apply_slot_substitution(
-                    deployer.mdict['pki_target_velocity_properties'])
-                deployer.file.apply_slot_substitution(
-                    deployer.mdict['pki_target_subsystem_web_xml'])
-
             # Strip "<filter>" section from subsystem "web.xml"
             # This is ONLY necessary because XML comments cannot be "nested"!
             # deployer.file.copy(deployer.mdict['pki_target_subsystem_web_xml'],
@@ -94,8 +85,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                 deployer.file.copy_with_slot_substitution(
                     deployer.mdict['pki_source_proxy_conf'],
                     deployer.mdict['pki_target_proxy_conf'])
-                deployer.file.apply_slot_substitution(
-                    deployer.mdict['pki_target_profileselect_template'])
             elif deployer.mdict['pki_subsystem'] == "TPS":
                 deployer.file.copy_with_slot_substitution(
                     deployer.mdict['pki_source_registry_cfg'],
diff --git a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
index f021a0e9a..b0a1113e6 100644
--- a/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
+++ b/base/server/python/pki/server/deployment/scriptlets/webapp_deployment.py
@@ -53,97 +53,14 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             deployer.directory.set_mode(
                 deployer.mdict['pki_tomcat_subsystem_webapps_path'])
 
-            # For TPS, deploy web application directly from /usr/share/pki.
-            if deployer.mdict['pki_subsystem'] == "TPS":
-                deployer.deploy_webapp(
-                    "tps",
-                    os.path.join(
-                        config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                        "tps",
-                        "webapps",
-                        "tps"),
-                    os.path.join(
-                        config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                        "tps",
-                        "conf",
-                        "Catalina",
-                        "localhost",
-                        "tps.xml"))
-
-                return self.rv
-
-            # For other subsystems, deploy as custom web application.
-
-            # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
-            # to <instance>/<subsystem>/webapps/<subsystem>
-            deployer.directory.copy(
+            # Deploy web application directly from /usr/share/pki.
+            deployer.deploy_webapp(
+                deployer.mdict['pki_subsystem'].lower(),
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
                     deployer.mdict['pki_subsystem'].lower(),
                     "webapps",
                     deployer.mdict['pki_subsystem'].lower()),
-                deployer.mdict['pki_tomcat_webapps_subsystem_path'],
-                overwrite_flag=True)
-
-            # Copy /usr/share/pki/server/webapps/pki/admin
-            # to <instance>/<subsystem>/webapps/<subsystem>/admin
-            # TODO: common templates should be deployed in common webapp
-            deployer.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    "server",
-                    "webapps",
-                    "pki",
-                    "admin"),
-                os.path.join(
-                    deployer.mdict['pki_tomcat_webapps_subsystem_path'],
-                    "admin"),
-                overwrite_flag=True)
-
-            deployer.directory.create(
-                deployer.mdict['pki_tomcat_webapps_subsystem_webinf_classes_path'])
-            deployer.directory.create(
-                deployer.mdict['pki_tomcat_webapps_subsystem_webinf_lib_path'])
-            # establish Tomcat webapps subsystem WEB-INF lib symbolic links
-            deployer.symlink.create(
-                deployer.mdict['pki_certsrv_jar'],
-                deployer.mdict['pki_certsrv_jar_link'])
-            deployer.symlink.create(
-                deployer.mdict['pki_cmsbundle'],
-                deployer.mdict['pki_cmsbundle_jar_link'])
-            deployer.symlink.create(
-                deployer.mdict['pki_cmscore'],
-                deployer.mdict['pki_cmscore_jar_link'])
-            deployer.symlink.create(
-                deployer.mdict['pki_cms'],
-                deployer.mdict['pki_cms_jar_link'])
-            deployer.symlink.create(
-                deployer.mdict['pki_cmsutil'],
-                deployer.mdict['pki_cmsutil_jar_link'])
-            deployer.symlink.create(
-                deployer.mdict['pki_nsutil'],
-                deployer.mdict['pki_nsutil_jar_link'])
-            if deployer.mdict['pki_subsystem'] == "CA":
-                deployer.symlink.create(
-                    deployer.mdict['pki_ca_jar'],
-                    deployer.mdict['pki_ca_jar_link'])
-            elif deployer.mdict['pki_subsystem'] == "KRA":
-                deployer.symlink.create(
-                    deployer.mdict['pki_kra_jar'],
-                    deployer.mdict['pki_kra_jar_link'])
-            elif deployer.mdict['pki_subsystem'] == "OCSP":
-                deployer.symlink.create(
-                    deployer.mdict['pki_ocsp_jar'],
-                    deployer.mdict['pki_ocsp_jar_link'])
-            elif deployer.mdict['pki_subsystem'] == "TKS":
-                deployer.symlink.create(
-                    deployer.mdict['pki_tks_jar'],
-                    deployer.mdict['pki_tks_jar_link'])
-
-            # Deploy subsystem web application.
-            deployer.deploy_webapp(
-                deployer.mdict['pki_subsystem'].lower(),
-                deployer.mdict['pki_tomcat_webapps_subsystem_path'],
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
                     deployer.mdict['pki_subsystem'].lower(),
@@ -167,10 +84,4 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "localhost",
                     deployer.mdict['pki_subsystem'].lower() + ".xml"))
 
-            # For subsystems other than TPS, delete
-            # <instance>/<subsystem>/webapps/<subsystem>.
-            if deployer.mdict['pki_subsystem'] != "TPS":
-                deployer.directory.delete(
-                    deployer.mdict['pki_tomcat_webapps_subsystem_path'])
-
         return self.rv