diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-09-02 15:51:53 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-09-02 15:51:53 -0700 |
| commit | c99069dac15a8c82e45e21747e94703c72c2a383 (patch) | |
| tree | 46ea2acd502138ab84d465f4e0e4924745b01081 /base/server/etc/default.cfg | |
| parent | e362995b7b63ae3bb4617a59caf9e1a6fefc1492 (diff) | |
| download | pki-c99069dac15a8c82e45e21747e94703c72c2a383.tar.gz pki-c99069dac15a8c82e45e21747e94703c72c2a383.tar.xz pki-c99069dac15a8c82e45e21747e94703c72c2a383.zip | |
Remove Apache info from pkispawn and pkidestroy
- PKI TRAC Ticket #1077 - Consider removing [Apache] section from 'default.cfg'
Diffstat (limited to 'base/server/etc/default.cfg')
| -rw-r--r-- | base/server/etc/default.cfg | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 7ecbf10af..9047e6e7c 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -52,7 +52,7 @@ destroy_scriplets= infrastructure_layout finalization -# By default, the following parameters will be set for Tomcat and Apache instances. +# By default, the following parameters will be set for Tomcat instances. # There is no reason to uncomment these. They are provided for reference in # case someone wants to override them in their config file. # @@ -60,11 +60,6 @@ destroy_scriplets= # pki_instance_name=pki-tomcat # pki_https_port=8443 # pki_http_port=8080 -# -# Apache instances: -# pki_instance_name=pki-apache -# pki_https_port=443 -# pki_http_port=80 pki_admin_cert_file=%(pki_client_dir)s/ca_admin.cert pki_admin_cert_request_type=pkcs10 @@ -164,32 +159,6 @@ pki_subsystem_registry_link=%(pki_subsystem_path)s/registry ############################################################################### -## Apache Configuration: ## -## ## -## Values in this section are common to PKI subsystems that run ## -## as an instance of 'Apache' (RA and TPS subsystems), and contain ## -## required information which MAY be overridden by users as necessary. ## -############################################################################### -[Apache] - -# Paths -# These are used in the processing of pkispawn and are not supposed -# to be overwritten by user configuration files. -# -pki_systemd_service=/lib/systemd/system/pki-apached@.service -pki_systemd_target=/lib/systemd/system/pki-apached.target -pki_systemd_target_wants=/etc/systemd/system/pki-apached.target.wants -pki_systemd_service_link=%(pki_systemd_target_wants)s/pki-apached@%(pki_instance_name)s.service -pki_cgroup_systemd_service_path=/sys/fs/cgroup/systemd/system/%(pki_systemd_service)s -pki_cgroup_systemd_service=%(pki_cgroup_systemd_service_path)s/%(pki_instance_name)s -pki_cgroup_cpu_systemd_service_path=/sys/fs/cgroup/cpu\,cpuacct/system/%(pki_systemd_service)s -pki_cgroup_cpu_systemd_service=%(pki_cgroup_cpu_systemd_service_path)s/%(pki_systemd_service)s -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: ## ## ## ## Values in this section are common to PKI subsystems that run ## |