1 files changed, 1 insertions, 137 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index c0f5a432f..a971fcbf6 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -198,6 +198,7 @@ class PKIConfigParser:
                                'pki_https_port': default_https_port,
                                'pki_dns_domainname': config.pki_dns_domainname,
                                'pki_subsystem' : config.pki_subsystem,
+                               'pki_subsystem_type': config.pki_subsystem.lower(),
                                'pki_hostname': config.pki_hostname}
 
             self.pki_config = ConfigParser.SafeConfigParser(predefined_dict)
@@ -327,143 +328,6 @@ class PKIConfigParser:
             #           (e. g. Apache:  "pki-apache", "pki-apache.example.com")
             #
 
-            # PKI Source name/value pairs
-            config.pki_master_dict['pki_source_conf_path'] =\
-                os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                             config.pki_master_dict['pki_subsystem'].lower(),
-                             "conf")
-            config.pki_master_dict['pki_source_setup_path'] =\
-                os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                             "setup")
-            config.pki_master_dict['pki_source_server_path'] =\
-                os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                             "server",
-                             "conf")
-            config.pki_master_dict['pki_source_cs_cfg'] =\
-                os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                             "CS.cfg")
-            config.pki_master_dict['pki_source_registry'] =\
-                os.path.join(config.pki_master_dict['pki_source_setup_path'],
-                             "pkidaemon_registry")
-            if config.pki_master_dict['pki_subsystem'] in\
-               config.PKI_APACHE_SUBSYSTEMS:
-                config.pki_master_dict['pki_systemd_service'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\
-                    "pki-apached" + "@" + ".service"
-                config.pki_master_dict['pki_systemd_target'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\
-                    "pki-apached.target"
-                config.pki_master_dict['pki_systemd_target_wants'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\
-                    "pki-apached.target.wants"
-                config.pki_master_dict['pki_systemd_service_link'] =\
-                    config.pki_master_dict['pki_systemd_target_wants'] + "/" +\
-                    "pki-apached" + "@" +\
-                    config.pki_master_dict['pki_instance_name'] + ".service"
-            elif config.pki_master_dict['pki_subsystem'] in\
-                 config.PKI_TOMCAT_SUBSYSTEMS:
-                config.pki_master_dict['pki_systemd_service'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\
-                    "pki-tomcatd" + "@" + ".service"
-                config.pki_master_dict['pki_systemd_target'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_ROOT + "/" +\
-                    "pki-tomcatd.target"
-                config.pki_master_dict['pki_systemd_target_wants'] =\
-                    config.PKI_DEPLOYMENT_SYSTEMD_CONFIGURATION_ROOT + "/" +\
-                    "pki-tomcatd.target.wants"
-                config.pki_master_dict['pki_systemd_service_link'] =\
-                    config.pki_master_dict['pki_systemd_target_wants'] + "/" +\
-                    "pki-tomcatd" + "@" +\
-                    config.pki_master_dict['pki_instance_name'] + ".service"
-                config.pki_master_dict['pki_tomcat_bin_path'] =\
-                    os.path.join(config.PKI_DEPLOYMENT_TOMCAT_ROOT,
-                                 "bin")
-                config.pki_master_dict['pki_tomcat_lib_path'] =\
-                    os.path.join(config.PKI_DEPLOYMENT_TOMCAT_ROOT,
-                                 "lib")
-                config.pki_master_dict['pki_tomcat_systemd'] =\
-                    config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD
-                config.pki_master_dict['pki_source_catalina_properties'] =\
-                    os.path.join(config.pki_master_dict['pki_source_server_path'],
-                                 "catalina.properties")
-                config.pki_master_dict['pki_source_servercertnick_conf'] =\
-                    os.path.join(config.pki_master_dict['pki_source_server_path'],
-                                 "serverCertNick.conf")
-                config.pki_master_dict['pki_source_server_xml'] =\
-                    os.path.join(config.pki_master_dict['pki_source_server_path'],
-                                 "server.xml")
-                config.pki_master_dict['pki_source_context_xml'] =\
-                    os.path.join(config.pki_master_dict['pki_source_server_path'],
-                                 "context.xml")
-                config.pki_master_dict['pki_source_tomcat_conf'] =\
-                    os.path.join(config.pki_master_dict['pki_source_server_path'],
-                                 "tomcat.conf")
-                if config.pki_master_dict['pki_subsystem'] == "CA":
-                    config.pki_master_dict['pki_source_emails'] =\
-                        os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                                     "ca",
-                                     "emails")
-                    config.pki_master_dict['pki_source_flatfile_txt'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "flatfile.txt")
-                    config.pki_master_dict['pki_source_profiles'] =\
-                        os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                                     "ca",
-                                     "profiles")
-                    config.pki_master_dict['pki_source_proxy_conf'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "proxy.conf")
-                    config.pki_master_dict['pki_source_registry_cfg'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "registry.cfg")
-                    # '*.profile'
-                    config.pki_master_dict['pki_source_admincert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "adminCert.profile")
-                    config.pki_master_dict['pki_source_caauditsigningcert_profile']\
-                        = os.path.join(
-                              config.pki_master_dict['pki_source_conf_path'],
-                              "caAuditSigningCert.profile")
-                    config.pki_master_dict['pki_source_cacert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "caCert.profile")
-                    config.pki_master_dict['pki_source_caocspcert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "caOCSPCert.profile")
-                    config.pki_master_dict['pki_source_servercert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "serverCert.profile")
-                    config.pki_master_dict['pki_source_subsystemcert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "subsystemCert.profile")
-                elif config.pki_master_dict['pki_subsystem'] == "KRA":
-                    # '*.profile'
-                    config.pki_master_dict['pki_source_servercert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "serverCert.profile")
-                    config.pki_master_dict['pki_source_storagecert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "storageCert.profile")
-                    config.pki_master_dict['pki_source_subsystemcert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "subsystemCert.profile")
-                    config.pki_master_dict['pki_source_transportcert_profile'] =\
-                        os.path.join(config.pki_master_dict['pki_source_conf_path'],
-                                     "transportCert.profile")
-            config.pki_master_dict['pki_cgroup_systemd_service_path'] =\
-                os.path.join("/sys/fs/cgroup/systemd/system",
-                             config.pki_master_dict['pki_systemd_service'])
-            config.pki_master_dict['pki_cgroup_systemd_service'] =\
-                os.path.join(
-                    config.pki_master_dict['pki_cgroup_systemd_service_path'],
-                    config.pki_master_dict['pki_instance_name'])
-            config.pki_master_dict['pki_cgroup_cpu_systemd_service_path'] =\
-                os.path.join("/sys/fs/cgroup/cpu\,cpuacct/system",
-                             config.pki_master_dict['pki_systemd_service'])
-            config.pki_master_dict['pki_cgroup_cpu_systemd_service'] =\
-                os.path.join(
-                    config.pki_master_dict['pki_cgroup_cpu_systemd_service_path'],
-                    config.pki_master_dict['pki_instance_name'])
             # PKI top-level file system layout name/value pairs
             # NOTE:  Never use 'os.path.join()' whenever 'pki_root_prefix'
             #        is being prepended!!!