summaryrefslogtreecommitdiffstats
path: root/base/server/etc/default.cfg
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-03-17 15:23:34 +0100
committerEndi S. Dewata <edewata@redhat.com>2016-04-02 07:48:04 +0200
commit9bd9548d5c1718ad8159f2134f170649c092a581 (patch)
tree0eacbafd403e00afe823c0fc3997cc7d1ffafc4e /base/server/etc/default.cfg
parenta1de52ab41d0b0c9d5df4163224525ce940e91a8 (diff)
downloadpki-9bd9548d5c1718ad8159f2134f170649c092a581.tar.gz
pki-9bd9548d5c1718ad8159f2134f170649c092a581.tar.xz
pki-9bd9548d5c1718ad8159f2134f170649c092a581.zip
Additional clean-ups for PKCS #12 utilities.
The pki_server_external_cert_path has been renamed to pki_server_external_certs_path to match the file name. A default pki_server_external_certs_path has been added to default.cfg. The pki pkcs12-export has been modified to export into existing PKCS #12 file by default. The pki-server instance-cert-export has been modified to accept a list of nicknames to export. https://fedorahosted.org/pki/ticket/1742
Diffstat (limited to 'base/server/etc/default.cfg')
-rw-r--r--base/server/etc/default.cfg5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg
index c503e6345..3e4b38f54 100644
--- a/base/server/etc/default.cfg
+++ b/base/server/etc/default.cfg
@@ -109,8 +109,6 @@ pki_security_domain_https_port=8443
pki_security_domain_name=%(pki_dns_domainname)s Security Domain
pki_security_domain_password=
pki_security_domain_user=caadmin
-pki_server_pkcs12_path=
-pki_server_pkcs12_password=
#for supporting server cert SAN injection
pki_san_inject=False
pki_san_for_server_cert=
@@ -190,6 +188,9 @@ pki_subsystem_registry_link=%(pki_subsystem_path)s/registry
###############################################################################
[Tomcat]
pki_ajp_port=8009
+pki_server_pkcs12_path=
+pki_server_pkcs12_password=
+pki_server_external_certs_path=
pki_clone=False
pki_clone_pkcs12_password=
pki_clone_pkcs12_path=