From b108353235bd40bf8f36004e6caee6be42578b15 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 12 Dec 2012 15:03:09 -0500 Subject: Removed duplicate pki_instance_id parameter. Ticket 435 --- base/deploy/etc/default.cfg | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'base/deploy/etc/default.cfg') diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg index abd0fb441..f665bb829 100644 --- a/base/deploy/etc/default.cfg +++ b/base/deploy/etc/default.cfg @@ -90,7 +90,6 @@ pki_ds_password= pki_ds_remove_data=True pki_ds_secure_connection=False pki_group=pkiuser -pki_instance_id=%(pki_instance_name)s pki_issuing_ca= pki_restart_configured_instance=True pki_security_domain_hostname=%(pki_hostname)s @@ -103,7 +102,7 @@ pki_skip_installation=False pki_ssl_server_key_algorithm=SHA256withRSA pki_ssl_server_key_size=2048 pki_ssl_server_key_type=rsa -pki_ssl_server_nickname=Server-Cert cert-%(pki_instance_id)s +pki_ssl_server_nickname=Server-Cert cert-%(pki_instance_name)s pki_ssl_server_subject_dn=cn=%(pki_hostname)s,o=%(pki_security_domain_name)s pki_ssl_server_token=Internal Key Storage Token pki_subsystem_key_algorithm=SHA256withRSA @@ -175,7 +174,7 @@ pki_tomcat_server_port=8005 pki_ca_signing_key_algorithm=SHA256withRSA pki_ca_signing_key_size=2048 pki_ca_signing_key_type=rsa -pki_ca_signing_nickname=caSigningCert cert-%(pki_instance_id)s CA +pki_ca_signing_nickname=caSigningCert cert-%(pki_instance_name)s CA pki_ca_signing_signing_algorithm=SHA256withRSA pki_ca_signing_subject_dn=cn=CA Signing Certificate,o=%(pki_security_domain_name)s pki_ca_signing_token=Internal Key Storage Token @@ -188,7 +187,7 @@ pki_import_admin_cert=False pki_ocsp_signing_key_algorithm=SHA256withRSA pki_ocsp_signing_key_size=2048 pki_ocsp_signing_key_type=rsa -pki_ocsp_signing_nickname=ocspSigningCert cert-%(pki_instance_id)s CA +pki_ocsp_signing_nickname=ocspSigningCert cert-%(pki_instance_name)s CA pki_ocsp_signing_signing_algorithm=SHA256withRSA pki_ocsp_signing_subject_dn=cn=CA OCSP Signing Certificate,o=%(pki_security_domain_name)s pki_ocsp_signing_token=Internal Key Storage Token @@ -198,13 +197,13 @@ pki_admin_name=%(pki_admin_uid)s pki_admin_nickname=PKI Administrator for %(pki_dns_domainname)s pki_admin_subject_dn=cn=PKI Administrator,e=%(pki_admin_email)s,o=%(pki_security_domain_name)s pki_admin_uid=caadmin -pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_id)s CA +pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_name)s CA pki_audit_signing_subject_dn=cn=CA Audit Signing Certificate,o=%(pki_security_domain_name)s -pki_ds_base_dn=o=%(pki_instance_id)s-CA +pki_ds_base_dn=o=%(pki_instance_name)s-CA pki_ds_database=%(pki_instance_name)s-CA pki_ds_hostname=%(pki_hostname)s pki_subsystem_name=CA %(pki_hostname)s %(pki_https_port)s -pki_subsystem_nickname=subsystemCert cert-%(pki_instance_id)s CA +pki_subsystem_nickname=subsystemCert cert-%(pki_instance_name)s CA pki_subsystem_subject_dn=cn=CA Subsystem Certificate,o=%(pki_security_domain_name)s @@ -220,14 +219,14 @@ pki_import_admin_cert=True pki_storage_key_algorithm=SHA256withRSA pki_storage_key_size=2048 pki_storage_key_type=rsa -pki_storage_nickname=storageCert cert-%(pki_instance_id)s KRA +pki_storage_nickname=storageCert cert-%(pki_instance_name)s KRA pki_storage_signing_algorithm=SHA256withRSA pki_storage_subject_dn=cn=DRM Storage Certificate,o=%(pki_security_domain_name)s pki_storage_token=Internal Key Storage Token pki_transport_key_algorithm=SHA256withRSA pki_transport_key_size=2048 pki_transport_key_type=rsa -pki_transport_nickname=transportCert cert-%(pki_instance_id)s KRA +pki_transport_nickname=transportCert cert-%(pki_instance_name)s KRA pki_transport_signing_algorithm=SHA256withRSA pki_transport_subject_dn=cn=DRM Transport Certificate,o=%(pki_security_domain_name)s pki_transport_token=Internal Key Storage Token @@ -236,13 +235,13 @@ pki_admin_name=%(pki_admin_uid)s pki_admin_nickname=PKI Administrator for %(pki_dns_domainname)s pki_admin_subject_dn=cn=PKI Administrator,e=%(pki_admin_email)s,o=%(pki_security_domain_name)s pki_admin_uid=kraadmin -pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_id)s KRA +pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_name)s KRA pki_audit_signing_subject_dn=cn=KRA Audit Signing Certificate,o=%(pki_security_domain_name)s -pki_ds_base_dn=o=%(pki_instance_id)s-KRA +pki_ds_base_dn=o=%(pki_instance_name)s-KRA pki_ds_database=%(pki_instance_name)s-KRA pki_ds_hostname=%(pki_hostname)s pki_subsystem_name=KRA %(pki_hostname)s %(pki_https_port)s -pki_subsystem_nickname=subsystemCert cert-%(pki_instance_id)s KRA +pki_subsystem_nickname=subsystemCert cert-%(pki_instance_name)s KRA pki_subsystem_subject_dn=cn=KRA Subsystem Certificate,o=%(pki_security_domain_name)s ############################################################################### @@ -257,7 +256,7 @@ pki_import_admin_cert=True pki_ocsp_signing_key_algorithm=SHA256withRSA pki_ocsp_signing_key_size=2048 pki_ocsp_signing_key_type=rsa -pki_ocsp_signing_nickname=ocspSigningCert cert-%(pki_instance_id)s OCSP +pki_ocsp_signing_nickname=ocspSigningCert cert-%(pki_instance_name)s OCSP pki_ocsp_signing_signing_algorithm=SHA256withRSA pki_ocsp_signing_subject_dn=cn=OCSP Signing Certificate,o=%(pki_security_domain_name)s pki_ocsp_signing_token=Internal Key Storage Token @@ -266,13 +265,13 @@ pki_admin_name=%(pki_admin_uid)s pki_admin_nickname=PKI Administrator for %(pki_dns_domainname)s pki_admin_subject_dn=cn=PKI Administrator,e=%(pki_admin_email)s,o=%(pki_security_domain_name)s pki_admin_uid=ocspadmin -pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_id)s OCSP +pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_name)s OCSP pki_audit_signing_subject_dn=cn=OCSP Audit Signing Certificate,o=%(pki_security_domain_name)s -pki_ds_base_dn=o=%(pki_instance_id)s-OCSP +pki_ds_base_dn=o=%(pki_instance_name)s-OCSP pki_ds_database=%(pki_instance_name)s-OCSP pki_ds_hostname=%(pki_hostname)s pki_subsystem_name=OCSP %(pki_hostname)s %(pki_https_port)s -pki_subsystem_nickname=subsystemCert cert-%(pki_instance_id)s OCSP +pki_subsystem_nickname=subsystemCert cert-%(pki_instance_name)s OCSP pki_subsystem_subject_dn=cn=OCSP Subsystem Certificate,o=%(pki_security_domain_name)s ############################################################################### @@ -297,13 +296,13 @@ pki_admin_name=%(pki_admin_uid)s pki_admin_nickname=PKI Administrator for %(pki_dns_domainname)s pki_admin_subject_dn=cn=PKI Administrator,e=%(pki_admin_email)s,o=%(pki_security_domain_name)s pki_admin_uid=tksadmin -pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_id)s TKS +pki_audit_signing_nickname=auditSigningCert cert-%(pki_instance_name)s TKS pki_audit_signing_subject_dn=cn=TKS Audit Signing Certificate,o=%(pki_security_domain_name)s -pki_ds_base_dn=o=%(pki_instance_id)s-TKS +pki_ds_base_dn=o=%(pki_instance_name)s-TKS pki_ds_database=%(pki_instance_name)s-TKS pki_ds_hostname=%(pki_hostname)s pki_subsystem_name=TKS %(pki_hostname)s %(pki_https_port)s -pki_subsystem_nickname=subsystemCert cert-%(pki_instance_id)s TKS +pki_subsystem_nickname=subsystemCert cert-%(pki_instance_name)s TKS pki_subsystem_subject_dn=cn=TKS Subsystem Certificate,o=%(pki_security_domain_name)s ############################################################################### -- cgit