Remove unused preop.cert.<tag>.nickname

dogtagpki · May 16, 2024 · bf893a2 · bf893a2
1 parent 0dcbd03
commit bf893a2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/base/ca/shared/conf/CS.cfg b/base/ca/shared/conf/CS.cfg
@@ -27,7 +27,6 @@ preop.cert.signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.signing.cncomponent.override=true
 preop.cert.signing.keysize.size=2048
 preop.cert.signing.keysize.custom_size=2048
-preop.cert.signing.nickname=caSigningCert cert-[pki_instance_name]
 preop.cert.signing.profile=caCert.profile
 preop.cert.signing.signing.required=true
 preop.cert.signing.subsystem=ca
@@ -36,7 +35,6 @@ preop.cert.signing.userfriendlyname=CA Signing Certificate
 preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[pki_instance_name]
 preop.cert.audit_signing.profile=caAuditSigningCert.profile
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=ca
@@ -46,7 +44,6 @@ preop.cert.audit_signing.cncomponent.override=true
 preop.cert.ocsp_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.ocsp_signing.keysize.custom_size=2048
 preop.cert.ocsp_signing.keysize.size=2048
-preop.cert.ocsp_signing.nickname=ocspSigningCert cert-[pki_instance_name]
 preop.cert.ocsp_signing.profile=caOCSPCert.profile
 preop.cert.ocsp_signing.signing.required=true
 preop.cert.ocsp_signing.subsystem=ca
@@ -56,7 +53,6 @@ preop.cert.ocsp_signing.cncomponent.override=true
 preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.sslserver.keysize.custom_size=2048
 preop.cert.sslserver.keysize.size=2048
-preop.cert.sslserver.nickname=[pki_sslserver_nickname]
 preop.cert.sslserver.profile=serverCert.profile
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=ca
@@ -66,7 +62,6 @@ preop.cert.sslserver.cncomponent.override=false
 preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[pki_instance_name]
 preop.cert.subsystem.profile=subsystemCert.profile
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=ca

diff --git a/base/kra/shared/conf/CS.cfg b/base/kra/shared/conf/CS.cfg
@@ -21,7 +21,6 @@ preop.cert.rsalist=transport,storage,audit_signing
 preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[pki_instance_name]
 preop.cert.audit_signing.profile=caInternalAuthAuditSigningCert
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=kra
@@ -31,7 +30,6 @@ preop.cert.audit_signing.cncomponent.override=true
 preop.cert.storage.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.storage.keysize.custom_size=2048
 preop.cert.storage.keysize.size=2048
-preop.cert.storage.nickname=storageCert cert-[pki_instance_name]
 preop.cert.storage.profile=caInternalAuthDRMstorageCert
 preop.cert.storage.signing.required=false
 preop.cert.storage.subsystem=kra
@@ -41,7 +39,6 @@ preop.cert.storage.cncomponent.override=true
 preop.cert.transport.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.transport.keysize.custom_size=2048
 preop.cert.transport.keysize.size=2048
-preop.cert.transport.nickname=transportCert cert-[pki_instance_name]
 preop.cert.transport.profile=caInternalAuthTransportCert
 preop.cert.transport.signing.required=false
 preop.cert.transport.subsystem=kra
@@ -51,7 +48,6 @@ preop.cert.transport.cncomponent.override=true
 preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.sslserver.keysize.custom_size=2048
 preop.cert.sslserver.keysize.size=2048
-preop.cert.sslserver.nickname=[pki_sslserver_nickname]
 preop.cert.sslserver.profile=caInternalAuthServerCert
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=kra
@@ -61,7 +57,6 @@ preop.cert.sslserver.cncomponent.override=false
 preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[pki_instance_name]
 preop.cert.subsystem.profile=caInternalAuthSubsystemCert
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=kra

diff --git a/base/ocsp/shared/conf/CS.cfg b/base/ocsp/shared/conf/CS.cfg
@@ -18,7 +18,6 @@ ocsp.cert.audit_signing.certusage=ObjectSigner
 preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[pki_instance_name]
 preop.cert.audit_signing.profile=caInternalAuthAuditSigningCert
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=ocsp
@@ -28,7 +27,6 @@ preop.cert.audit_signing.cncomponent.override=true
 preop.cert.signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.signing.keysize.custom_size=2048
 preop.cert.signing.keysize.size=2048
-preop.cert.signing.nickname=ocspSigningCert cert-[pki_instance_name]
 preop.cert.signing.profile=caInternalAuthOCSPCert
 preop.cert.signing.signing.required=true
 preop.cert.signing.subsystem=ocsp
@@ -38,7 +36,6 @@ preop.cert.signing.cncomponent.override=true
 preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.sslserver.keysize.custom_size=2048
 preop.cert.sslserver.keysize.size=2048
-preop.cert.sslserver.nickname=[pki_sslserver_nickname]
 preop.cert.sslserver.profile=caInternalAuthServerCert
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=ocsp
@@ -48,7 +45,6 @@ preop.cert.sslserver.cncomponent.override=false
 preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[pki_instance_name]
 preop.cert.subsystem.profile=caInternalAuthSubsystemCert
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=ocsp

diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py
@@ -809,7 +809,6 @@ def init_system_cert_params(self, subsystem):
             else:
                 fullname = tokenname + ':' + nickname
 
-            subsystem.set_config('preop.cert.%s.nickname' % config_tag, nickname)
             subsystem.set_config('%s.%s.nickname' % (subsystem.name, config_tag), nickname)
             subsystem.set_config('%s.%s.tokenname' % (subsystem.name, config_tag), tokenname)
             subsystem.set_config('%s.cert.%s.nickname' % (subsystem.name, config_tag), fullname)

diff --git a/base/tks/shared/conf/CS.cfg b/base/tks/shared/conf/CS.cfg
@@ -15,7 +15,6 @@ preop.cert.rsalist=audit_signing
 preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[pki_instance_name]
 preop.cert.audit_signing.profile=caInternalAuthAuditSigningCert
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=tks
@@ -25,7 +24,6 @@ preop.cert.audit_signing.cncomponent.override=true
 preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.sslserver.keysize.custom_size=2048
 preop.cert.sslserver.keysize.size=2048
-preop.cert.sslserver.nickname=[pki_sslserver_nickname]
 preop.cert.sslserver.profile=caInternalAuthServerCert
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=tks
@@ -35,7 +33,6 @@ preop.cert.sslserver.cncomponent.override=false
 preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[pki_instance_name]
 preop.cert.subsystem.profile=caInternalAuthSubsystemCert
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=tks

diff --git a/base/tps/shared/conf/CS.cfg b/base/tps/shared/conf/CS.cfg
@@ -1998,7 +1998,6 @@ preop.cert.audit_signing.cncomponent.override=true
 preop.cert.audit_signing.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.audit_signing.keysize.custom_size=2048
 preop.cert.audit_signing.keysize.size=2048
-preop.cert.audit_signing.nickname=auditSigningCert cert-[pki_instance_name]
 preop.cert.audit_signing.profile=caInternalAuthAuditSigningCert
 preop.cert.audit_signing.signing.required=false
 preop.cert.audit_signing.subsystem=tps
@@ -2010,7 +2009,6 @@ preop.cert.sslserver.cncomponent.override=false
 preop.cert.sslserver.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.sslserver.keysize.custom_size=2048
 preop.cert.sslserver.keysize.size=2048
-preop.cert.sslserver.nickname=[pki_sslserver_nickname]
 preop.cert.sslserver.profile=caInternalAuthServerCert
 preop.cert.sslserver.signing.required=false
 preop.cert.sslserver.subsystem=tps
@@ -2020,7 +2018,6 @@ preop.cert.subsystem.cncomponent.override=true
 preop.cert.subsystem.defaultSigningAlgorithm=SHA256withRSA
 preop.cert.subsystem.keysize.custom_size=2048
 preop.cert.subsystem.keysize.size=2048
-preop.cert.subsystem.nickname=subsystemCert cert-[pki_instance_name]
 preop.cert.subsystem.profile=caInternalAuthSubsystemCert
 preop.cert.subsystem.signing.required=false
 preop.cert.subsystem.subsystem=tps