diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-05-29 15:42:46 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-06-03 19:08:24 -0400 |
| commit | 2b1efa0fa66b247ae0b1e4c605f1ed8290bd7a08 (patch) | |
| tree | 2860ea3d64200b8e718ee77e4ef9a6760798cea5 /base/tks | |
| parent | f9277f58629f5228f1717c3575e79d154da47858 (diff) | |
| download | pki-2b1efa0fa66b247ae0b1e4c605f1ed8290bd7a08.tar.gz pki-2b1efa0fa66b247ae0b1e4c605f1ed8290bd7a08.tar.xz pki-2b1efa0fa66b247ae0b1e4c605f1ed8290bd7a08.zip | |
Fixed hard-coded server certificate nickname.
Previously the server certificate name was partially hard-coded as
"Server-Cert cert-[PKI_INSTANCE_NAME]". Now in Tomcat-based subsystems
it can be fully configured using pki_ssl_server_nickname parameter.
In Apache-based subsystems it's left unchanged.
Unused serverCertNick.conf files have been removed.
Ticket #631
Diffstat (limited to 'base/tks')
| -rw-r--r-- | base/tks/shared/conf/CS.cfg.in | 2 | ||||
| -rw-r--r-- | base/tks/shared/conf/serverCertNick.conf | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in index 74749055f..4fbf21e68 100644 --- a/base/tks/shared/conf/CS.cfg.in +++ b/base/tks/shared/conf/CS.cfg.in @@ -53,7 +53,7 @@ preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA preop.cert.sslserver.dn=CN=[PKI_HOSTNAME] preop.cert.sslserver.keysize.custom_size=2048 preop.cert.sslserver.keysize.size=2048 -preop.cert.sslserver.nickname=Server-Cert cert-[PKI_INSTANCE_NAME] +preop.cert.sslserver.nickname=[PKI_SSL_SERVER_NICKNAME] preop.cert.sslserver.profile=caInternalAuthServerCert preop.cert.sslserver.signing.required=false preop.cert.sslserver.subsystem=tks diff --git a/base/tks/shared/conf/serverCertNick.conf b/base/tks/shared/conf/serverCertNick.conf deleted file mode 100644 index a7a0d2899..000000000 --- a/base/tks/shared/conf/serverCertNick.conf +++ /dev/null @@ -1,6 +0,0 @@ -# --- BEGIN COPYRIGHT BLOCK --- -# Copyright (C) 2006 Red Hat, Inc. -# All rights reserved. -# --- END COPYRIGHT BLOCK --- -# -Server-Cert cert-[PKI_INSTANCE_NAME] |