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/server | |
| 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/server')
| -rw-r--r-- | base/server/config/pkislots.cfg | 1 | ||||
| -rw-r--r-- | base/server/src/engine/pkiparser.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/base/server/config/pkislots.cfg b/base/server/config/pkislots.cfg index 0b239020f..8c5212320 100644 --- a/base/server/config/pkislots.cfg +++ b/base/server/config/pkislots.cfg @@ -75,6 +75,7 @@ PKI_SECURE_PORT_CONNECTOR_NAME_SLOT=[PKI_SECURE_PORT_CONNECTOR_NAME] PKI_SECURE_PORT_SERVER_COMMENT_SLOT=[PKI_SECURE_PORT_SERVER_COMMENT] PKI_SECURITY_MANAGER_SLOT=[PKI_SECURITY_MANAGER] PKI_SERVER_XML_CONF_SLOT=[PKI_SERVER_XML_CONF] +PKI_SSL_SERVER_NICKNAME_SLOT=[PKI_SSL_SERVER_NICKNAME] PKI_SUBSYSTEM_TYPE_SLOT=[PKI_SUBSYSTEM_TYPE] PKI_SYSTEMD_SERVICENAME_SLOT=[PKI_SYSTEMD_SERVICENAME] PKI_TMPDIR_SLOT=[PKI_TMPDIR] diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py index 99c8855b9..6a94e3827 100644 --- a/base/server/src/engine/pkiparser.py +++ b/base/server/src/engine/pkiparser.py @@ -746,6 +746,8 @@ class PKIConfigParser: config.pki_master_dict['pki_security_manager'] config.pki_master_dict['PKI_SERVER_XML_CONF_SLOT'] =\ config.pki_master_dict['pki_target_server_xml'] + config.pki_master_dict['PKI_SSL_SERVER_NICKNAME_SLOT'] =\ + config.pki_master_dict['pki_ssl_server_nickname'] config.pki_master_dict['PKI_SUBSYSTEM_TYPE_SLOT'] =\ config.pki_master_dict['pki_subsystem'].lower() config.pki_master_dict['PKI_SYSTEMD_SERVICENAME_SLOT'] =\ @@ -847,7 +849,7 @@ class PKIConfigParser: "secmod.db") config.pki_master_dict['pki_self_signed_token'] = "internal" config.pki_master_dict['pki_self_signed_nickname'] =\ - "Server-Cert cert-" + config.pki_master_dict['pki_instance_name'] + config.pki_master_dict['pki_ssl_server_nickname'] config.pki_master_dict['pki_self_signed_subject'] =\ "cn=" + config.pki_master_dict['pki_hostname'] + "," +\ "o=" + config.pki_master_dict['pki_certificate_timestamp'] |