Updated deployment scripts.

1 files changed, 10 insertions, 37 deletions

diff --git a/scripts/merged.cfg b/scripts/merged.cfg
index cd4073a..50d71f9 100644
--- a/scripts/merged.cfg
+++ b/scripts/merged.cfg
@@ -27,10 +27,16 @@ pki_token_password=Secret123
 ##         'common' data values which are left undefined.                    ##
 ###############################################################################
 [Common]
+pki_admin_cert_file=
 pki_admin_cert_request_type=crmf
 pki_admin_domain_name=
 pki_admin_dualkey=False
+pki_admin_email=
 pki_admin_keysize=2048
+pki_admin_name=
+pki_admin_nickname=
+pki_admin_subject_dn=
+pki_admin_uid=
 pki_audit_group=pkiaudit
 pki_audit_signing_key_algorithm=SHA256withRSA
 pki_audit_signing_key_size=2048
@@ -43,6 +49,7 @@ pki_backup_keys=False
 pki_client_database_dir=
 pki_client_database_purge=True
 pki_client_dir=
+pki_ds_base_dn=
 pki_ds_bind_dn=cn=Directory Manager
 pki_ds_database=
 pki_ds_hostname=
@@ -72,6 +79,7 @@ pki_subsystem_nickname=
 pki_subsystem_subject_dn=
 pki_subsystem_token=
 pki_token_name=internal
+pki_use_common_admin_user=true
 pki_user=pkiuser
 ###############################################################################
 ##  'Apache' Data:                                                           ##
@@ -112,7 +120,7 @@ pki_enable_java_debugger=False
 pki_enable_proxy=False
 pki_http_port=8080
 pki_https_port=8443
-pki_instance_name=master
+pki_instance_name=pki-tomcat
 pki_proxy_http_port=80
 pki_proxy_https_port=443
 pki_security_manager=true
@@ -134,11 +142,6 @@ pki_tomcat_server_port=8005
 ##                    are MUTUALLY EXCLUSIVE entities!!!                     ##
 ###############################################################################
 [CA]
-pki_admin_email=ca_admin@example.com
-pki_admin_name=CA Admin
-pki_admin_nickname=ca-admin
-pki_admin_subject_dn=cn=CA Admin,dc=ca,dc=example,dc=com
-pki_admin_uid=ca_admin
 pki_ca_signing_key_algorithm=SHA256withRSA
 pki_ca_signing_key_size=2048
 pki_ca_signing_key_type=rsa
@@ -146,7 +149,6 @@ pki_ca_signing_nickname=
 pki_ca_signing_signing_algorithm=SHA256withRSA
 pki_ca_signing_subject_dn=
 pki_ca_signing_token=
-pki_ds_base_dn=dc=ca,dc=example,dc=com
 pki_external=False
 pki_external_ca_cert_chain_path=
 pki_external_ca_cert_path=
@@ -162,6 +164,7 @@ pki_ocsp_signing_token=
 pki_subordinate=False
 pki_subsystem=CA
 pki_subsystem_name=
+pki_use_common_admin_user=false
 ###############################################################################
 ##  'KRA' Data:                                                              ##
 ##                                                                           ##
@@ -170,12 +173,6 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [KRA]
-pki_admin_email=kra_admin@example.com
-pki_admin_name=KRA Admin
-pki_admin_nickname=kra-admin
-pki_admin_subject_dn=cn=KRA Admin,dc=kra,dc=example,dc=com
-pki_admin_uid=kra_admin
-pki_ds_base_dn=dc=kra,dc=example,dc=com
 pki_storage_key_algorithm=SHA256withRSA
 pki_storage_key_size=2048
 pki_storage_key_type=rsa
@@ -200,12 +197,6 @@ pki_transport_token=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [OCSP]
-pki_admin_email=ocsp_admin@example.com
-pki_admin_name=OCSP Admin
-pki_admin_nickname=ocsp-admin
-pki_admin_subject_dn=cn=OCSP Admin,dc=ocsp,dc=example,dc=com
-pki_admin_uid=ocsp_admin
-pki_ds_base_dn=dc=ocsp,dc=example,dc=com
 pki_ocsp_signing_key_algorithm=SHA256withRSA
 pki_ocsp_signing_key_size=2048
 pki_ocsp_signing_key_type=rsa
@@ -222,12 +213,6 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [RA]
-pki_admin_email=ra_admin@example.com
-pki_admin_name=RA Admin
-pki_admin_nickname=ra-admin
-pki_admin_subject_dn=cn=RA Admin,dc=ra,dc=example,dc=com
-pki_admin_uid=ra_admin
-pki_ds_base_dn=dc=ra,dc=example,dc=com
 pki_subsystem=RA
 pki_subsystem_name=
 ###############################################################################
@@ -238,12 +223,6 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [TKS]
-pki_admin_email=tks_admin@example.com
-pki_admin_name=TKS Admin
-pki_admin_nickname=tks-admin
-pki_admin_subject_dn=cn=TKS Admin,dc=tks,dc=example,dc=com
-pki_admin_uid=tks_admin
-pki_ds_base_dn=dc=tks,dc=example,dc=com
 pki_subsystem=TKS
 pki_subsystem_name=
 ###############################################################################
@@ -253,11 +232,5 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [TPS]
-pki_admin_email=tps_admin@example.com
-pki_admin_name=TPS Admin
-pki_admin_nickname=tps-admin
-pki_admin_subject_dn=cn=TPS Admin,dc=tps,dc=example,dc=com
-pki_admin_uid=tps_admin
-pki_ds_base_dn=dc=tps,dc=example,dc=com
 pki_subsystem=TPS
 pki_subsystem_name=