From b41da86d8afe32567779fefd705bf3b6c65f5838 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Mon, 17 Dec 2012 11:50:39 -0500 Subject: interpolate more paths --- base/deploy/etc/default.cfg | 61 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 7 deletions(-) (limited to 'base/deploy/etc') diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg index ea9c95677..d619cdc94 100644 --- a/base/deploy/etc/default.cfg +++ b/base/deploy/etc/default.cfg @@ -117,10 +117,10 @@ pki_user=pkiuser # These are used in the processing of pkispawn and are not supposed # to be overwritten by user configuration files. # -pki_source_conf_path=/usr/share/pki/%{pki_subsystem_type}/conf +pki_source_conf_path=/usr/share/pki/%(pki_subsystem_type)s/conf pki_source_setup_path=/usr/share/pki/setup pki_source_server_path=/usr/share/pki/server/conf -pki_source_cs_cfg=/usr/share/pki/%{pki_subsystem_type}/conf/CS.cfg +pki_source_cs_cfg=/usr/share/pki/%(pki_subsystem_type)s/conf/CS.cfg pki_source_registry=/usr/share/pki/setup/pkidaemon_registry pki_path=%(pki_root_prefix)s/var/lib/pki pki_log_path=%(pki_root_prefix)s/var/log/pki @@ -129,6 +129,18 @@ pki_registry_path=%(pki_root_prefix)s/etc/sysconfig/pki pki_instance_path=%(pki_path)s/%(pki_instance_name)s pki_instance_log_path=%(pki_log_path)s/%(pki_instance_name)s pki_instance_configuration_path=%(pki_configuration_path)s/%(pki_instance_name)s +pki_database_path=%(pki_instance_configuration_path)s/alias +pki_instance_database_link=%(pki_instance_path)s/alias +pki_instance_conf_link=%(pki_instance_path)s/conf +pki_instance_logs_link=%(pki_instance_path)s/logs +pki_subsystem_path=%(pki_instance_path)s/%(pki_subsystem_type)s +pki_subsystem_log_path=%(pki_instance_log_path)s/%(pki_subsystem_type)s +pki_subsystem_archive_log_path=%(pki_subsystem_log_path)s/archive +pki_subsystem_configuration_path=%(pki_instance_configuration_path)s/%(pki_subsystem_type)s +pki_subsystem_database_link=%(pki_subsystem_path)s/alias +pki_subsystem_conf_link=%(pki_subsystem_path)s/conf +pki_subsystem_logs_link=%(pki_subsystem_path)s/logs +pki_subsystem_registry_link=%(pki_subsystem_path)s/registry ############################################################################### @@ -155,6 +167,7 @@ pki_cgroup_cpu_systemd_service=%(pki_cgroup_cpu_systemd_service_path)s/%(pki_sys pki_instance_type=Apache pki_instance_type_registry_path =%(pki_registry_path)s/apache pki_instance_registry_path=%(pki_instance_type_registry_path)s/%(pki_instance_name)s +pki_subsystem_registry_path=%(pki_instance_registry_path)s/%(pki_subsystem_type)s ############################################################################### ## Tomcat Configuration: ## @@ -216,22 +229,37 @@ pki_tomcat_webapps_path=%(pki_instance_path)s/webapps pki_tomcat_webapps_root_path=%(pki_tomcat_webapps_path)s/ROOT pki_tomcat_webapps_common_path=%(pki_tomcat_webapps_path)s/pki pki_tomcat_webapps_root_webinf_path=%(pki_tomcat_webapps_root_path)s/WEB-INF -pki_tomcat_work_path=%(pki_instance_path)/work +pki_tomcat_work_path=%(pki_instance_path)s/work pki_tomcat_work_catalina_path=%(pki_tomcat_work_path)s/Catalina pki_tomcat_work_catalina_host_path=%(pki_tomcat_work_catalina_path)s/localhost pki_tomcat_work_catalina_host_run_path=%(pki_tomcat_work_catalina_host_path)s/_ pki_tomcat_work_catalina_host_subsystem_path=%(pki_tomcat_work_catalina_host_path)s/%(pki_subsystem_type)s -pki_instance_conf_log4j_properties=%(pki_instance_configuration_path)/log4j.properties +pki_instance_conf_log4j_properties=%(pki_instance_configuration_path)s/log4j.properties pki_instance_type_registry_path=%(pki_registry_path)s/tomcat pki_instance_registry_path=%(pki_instance_type_registry_path)s/%(pki_instance_name)s +pki_subsystem_registry_path=%(pki_instance_registry_path)s/%(pki_subsystem_type)s pki_tomcat_bin_link=%(pki_instance_path)s/bin pki_instance_lib=%(pki_instance_path)s/lib -pki_instance_lib_log4j_properties=%(pki_instance_lib)/log4j.properties +pki_instance_lib_log4j_properties=%(pki_instance_lib)s/log4j.properties pki_instance_systemd_link=%(pki_instance_path)s/%(pki_instance_name)s +pki_subsystem_signed_audit_log_path=%(pki_subsystem_log_path)s/signedAudit +pki_subsystem_tomcat_webapps_link=%(pki_subsystem_path)s/webapps +pki_tomcat_webapps_subsystem_path=%(pki_tomcat_webapps_path)s/%(pki_subsystem_type)s +pki_tomcat_webapps_subsystem_webinf_classes_path=%(pki_tomcat_webapps_subsystem_path)s/WEB-INF/classes +pki_tomcat_webapps_subsystem_webinf_lib_path=%(pki_tomcat_webapps_subsystem_path)s/WEB-INF/lib +pki_certsrv_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-certsrv.jar +pki_cmsbundle_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmsbundle.jar +pki_cmscore_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmscore.jar +pki_cms_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cms.jar +pki_cmsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-cmsutil.jar +pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil.jar + # JAR paths # These are used in the processing of pkispawn and are not supposed # to be overwritten by user configuration files +pki_jss_jar=%(arch_java_lib)s/jss4.jar +pki_symkey_jar=%(arch_java_lib)s/symkey.jar pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar pki_apache_commons_logging_jar=/usr/share/java/apache-commons-logging.jar @@ -250,7 +278,7 @@ pki_resteasy_jaxrs_api_jar=%(resteasy_lib)s/jaxrs-api.jar pki_nsutil=/usr/share/java/pki/pki-nsutil.jar pki_tomcat_jar=/usr/share/java/pki/pki-tomcat.jar pki_resteasy_atom_provider_jar=%(resteasy_lib)s/resteasy-atom-provider.jar -pki_resteasy_jaxb_provider_jar==%(resteasy_lib)s/resteasy-jaxb-provider.jar +pki_resteasy_jaxb_provider_jar=%(resteasy_lib)s/resteasy-jaxb-provider.jar pki_resteasy_jaxrs_jar=%(resteasy_lib)s/resteasy-jaxrs.jar pki_resteasy_jettison_provider_jar=%(resteasy_lib)s/resteasy-jettison-provider.jar pki_scannotation_jar=/usr/share/java/scannotation.jar @@ -274,7 +302,7 @@ pki_ldapjdk_jar_link=%(pki_tomcat_common_lib_path)s/ldapjdk.jar pki_tomcat_jar_link=%(pki_tomcat_common_lib_path)s/pki-tomcat.jar pki_resteasy_atom_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-atom-provider.jar pki_resteasy_jaxb_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jaxb-provider.jar -pki_resteasy_jaxrs_jar_link==%(pki_tomcat_common_lib_path)s/resteasy-jaxrs.jar +pki_resteasy_jaxrs_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jaxrs.jar pki_resteasy_jettison_provider_jar_link=%(pki_tomcat_common_lib_path)s/resteasy-jettison-provider.jar pki_scannotation_jar_link=%(pki_tomcat_common_lib_path)s/scannotation.jar pki_tomcatjss_jar_link=%(pki_tomcat_common_lib_path)s/tomcatjss.jar @@ -282,6 +310,14 @@ pki_velocity_jar_link=%(pki_tomcat_common_lib_path)s/velocity.jar pki_xerces_j2_jar_link=%(pki_tomcat_common_lib_path)s/xerces-j2.jar pki_xml_commons_apis_jar_link=%(pki_tomcat_common_lib_path)s/xml-commons-apis.jar pki_xml_commons_resolver_jar_link=%(pki_tomcat_common_lib_path)s/xml-commons-resolver.jar +pki_ca_jar=/usr/share/java/pki/pki-ca.jar +pki_ca_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-ca.jar +pki_kra_jar=/usr/share/java/pki/pki-kra.jar +pki_kra_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-kra.jar +pki_ocsp_jar=/usr/share/java/pki/pki-ocsp.jar +pki_ocsp_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-ocsp.jar +pki_tks_jar=usr/share/java/pki/pki-tks.jar +pki_tks_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-tks.jar @@ -352,6 +388,10 @@ pki_source_cacert_profile=%(pki_source_conf_path)s/caCert.profile pki_source_caocspcert_profile=%(pki_source_conf_path)s/caOCSPCert.profile pki_source_servercert_profile=%(pki_source_conf_path)s/serverCert.profile pki_source_subsystemcert_profile=%(pki_source_conf_path)s/subsystemCert.profile +pki_subsystem_emails_path=%(pki_subsystem_path)s/emails +pki_subsystem_profiles_path=%(pki_subsystem_path)s/profiles + + ############################################################################### @@ -468,3 +508,10 @@ pki_subsystem_subject_dn=cn=TKS Subsystem Certificate,o=%(pki_security_domain_na ## required information which MAY be overridden by users as necessary. ## ############################################################################### [TPS] + +# Paths +# These are used in the processing of pkispawn and are not supposed +# to be overwritten by user configuration files. +# +pki_subsystem_signed_audit_log_path=%(pki_subsystem_log_path)s/signedAudit + -- cgit