From e7e06f6d78c299b2ad99f2e6eb00e0a5156d65e5 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slaznick@redhat.com>
Date: Mar 22 2018 15:17:29 +0000
Subject: Dogtag configs: rename deprecated options


ipa-{server,kra}-install logs have been showing warnings about
deprecation of some Dogtag configuration options. Follow
the warnings' advice and rename these options to their newer
form.

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Koksharov <akokshar@redhat.com>

---

diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 8a11b5d..75a37af 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -540,7 +540,7 @@ class CAInstance(DogtagInstance):
             str(DN(('cn', 'CA Subsystem'), self.subject_base)))
         config.set("CA", "pki_ocsp_signing_subject_dn",
             str(DN(('cn', 'OCSP Subsystem'), self.subject_base)))
-        config.set("CA", "pki_ssl_server_subject_dn",
+        config.set("CA", "pki_sslserver_subject_dn",
             str(DN(('cn', self.fqdn), self.subject_base)))
         config.set("CA", "pki_audit_signing_subject_dn",
             str(DN(('cn', 'CA Audit'), self.subject_base)))
@@ -551,7 +551,7 @@ class CAInstance(DogtagInstance):
         # Certificate nicknames
         config.set("CA", "pki_subsystem_nickname", "subsystemCert cert-pki-ca")
         config.set("CA", "pki_ocsp_signing_nickname", "ocspSigningCert cert-pki-ca")
-        config.set("CA", "pki_ssl_server_nickname", "Server-Cert cert-pki-ca")
+        config.set("CA", "pki_sslserver_nickname", "Server-Cert cert-pki-ca")
         config.set("CA", "pki_audit_signing_nickname", "auditSigningCert cert-pki-ca")
         config.set("CA", "pki_ca_signing_nickname", "caSigningCert cert-pki-ca")
 
diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py
index 9fd78ed..8878abb 100644
--- a/ipaserver/install/krainstance.py
+++ b/ipaserver/install/krainstance.py
@@ -208,7 +208,7 @@ class KRAInstance(DogtagInstance):
         # Certificate subject DNs
         config.set("KRA", "pki_subsystem_subject_dn",
                    str(DN(('cn', 'CA Subsystem'), self.subject_base)))
-        config.set("KRA", "pki_ssl_server_subject_dn",
+        config.set("KRA", "pki_sslserver_subject_dn",
                    str(DN(('cn', self.fqdn), self.subject_base)))
         config.set("KRA", "pki_audit_signing_subject_dn",
                    str(DN(('cn', 'KRA Audit'), self.subject_base)))
@@ -224,7 +224,7 @@ class KRAInstance(DogtagInstance):
         # the ca certs.
         config.set("KRA", "pki_subsystem_nickname",
                    "subsystemCert cert-pki-ca")
-        config.set("KRA", "pki_ssl_server_nickname",
+        config.set("KRA", "pki_sslserver_nickname",
                    "Server-Cert cert-pki-ca")
         config.set("KRA", "pki_audit_signing_nickname",
                    "auditSigningCert cert-pki-kra")