do parameter interpolation part 1alee-interpolation

1 files changed, 15 insertions, 34 deletions

diff --git a/base/deploy/config/deployment.cfg b/base/deploy/config/deployment.cfg
index 6ff7a35bb..bb2bfa9b9 100644
--- a/base/deploy/config/deployment.cfg
+++ b/base/deploy/config/deployment.cfg
@@ -1,8 +1,13 @@
 ###############################################################################
-##  Default Configuration:                                                   ##
+##  Common Configuration:                                                    ##
+##                                                                           ##
+##  Values in this section are common to more than one PKI subsystem, and    ##
+##  contain required information which MAY be overridden by users as         ##
+##  necessary.                                                               ##
+##                                                                           ##
+##  There are also some meta-parameters that determine how the PKI           ##
+##  configuratiion should work.                                              ##
 ##                                                                           ##
-##  This section contains meta-parameters that determine how the PKI         ##
-##  configuration should work.                                               ##
 ###############################################################################
 [DEFAULT]
 
@@ -47,17 +52,6 @@ destroy_scriplets=
     infrastructure_layout
     finalization
 
-###############################################################################
-##  Common Configuration:                                                    ##
-##                                                                           ##
-##  Values in this section are common to more than one PKI subsystem, and    ##
-##  contain required information which MAY be overridden by users as         ##
-##  necessary.                                                               ##
-##                                                                           ##
-##  NOTE:  Default values will be generated for any and all required         ##
-##         'common' data values which are left undefined.                    ##
-###############################################################################
-[Common]
 pki_admin_cert_request_type=crmf
 pki_admin_domain_name=
 pki_admin_dualkey=False
@@ -85,14 +79,17 @@ pki_client_dir=
 pki_client_pkcs12_password=
 pki_ds_base_dn=
 pki_ds_bind_dn=cn=Directory Manager
-pki_ds_database=
-pki_ds_hostname=
+pki_ds_database=%(pki_instance_name)s-%(pki_subsystem)s
+pki_ds_hostname=%(hostname)s
 pki_ds_ldap_port=389
 pki_ds_ldaps_port=636
 pki_ds_password=
 pki_ds_remove_data=True
 pki_ds_secure_connection=False
 pki_group=pkiuser
+pki_http_port=%(default_http_port)s
+pki_https_port=%(default_https_port)s
+pki_instance_name=%(default_instance_name)s
 pki_issuing_ca=
 pki_restart_configured_instance=True
 pki_security_domain_hostname=
@@ -108,9 +105,11 @@ pki_ssl_server_key_type=rsa
 pki_ssl_server_nickname=
 pki_ssl_server_subject_dn=
 pki_ssl_server_token=
+pki_subsystem=%(subsystem_type)s
 pki_subsystem_key_algorithm=SHA256withRSA
 pki_subsystem_key_size=2048
 pki_subsystem_key_type=rsa
+pki_subsystem_name=%(pki_subsystem)s %(hostname)s %(pki_https_port)s
 pki_subsystem_nickname=
 pki_subsystem_subject_dn=
 pki_subsystem_token=
@@ -126,9 +125,6 @@ pki_user=pkiuser
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [Apache]
-pki_instance_name=pki-apache
-pki_http_port=80
-pki_https_port=443
 
 ###############################################################################
 ##  Tomcat Configuration:                                                    ##
@@ -157,9 +153,6 @@ pki_clone_replication_security=None
 pki_clone_uri=
 pki_enable_java_debugger=False
 pki_enable_proxy=False
-pki_http_port=8080
-pki_https_port=8443
-pki_instance_name=pki-tomcat
 pki_proxy_http_port=80
 pki_proxy_https_port=443
 pki_security_manager=true
@@ -203,8 +196,6 @@ pki_ocsp_signing_signing_algorithm=SHA256withRSA
 pki_ocsp_signing_subject_dn=
 pki_ocsp_signing_token=
 pki_subordinate=False
-pki_subsystem=CA
-pki_subsystem_name=
 
 ###############################################################################
 ##  KRA Configuration:                                                       ##
@@ -222,8 +213,6 @@ pki_storage_nickname=
 pki_storage_signing_algorithm=SHA256withRSA
 pki_storage_subject_dn=
 pki_storage_token=
-pki_subsystem=KRA
-pki_subsystem_name=
 pki_transport_key_algorithm=SHA256withRSA
 pki_transport_key_size=2048
 pki_transport_key_type=rsa
@@ -248,8 +237,6 @@ pki_ocsp_signing_nickname=
 pki_ocsp_signing_signing_algorithm=SHA256withRSA
 pki_ocsp_signing_subject_dn=
 pki_ocsp_signing_token=
-pki_subsystem=OCSP
-pki_subsystem_name=
 
 ###############################################################################
 ##  RA Configuration:                                                        ##
@@ -258,8 +245,6 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [RA]
-pki_subsystem=RA
-pki_subsystem_name=
 
 ###############################################################################
 ##  TKS Configuration:                                                       ##
@@ -270,8 +255,6 @@ pki_subsystem_name=
 ###############################################################################
 [TKS]
 pki_import_admin_cert=True
-pki_subsystem=TKS
-pki_subsystem_name=
 
 ###############################################################################
 ##  TPS Configuration:                                                       ##
@@ -280,5 +263,3 @@ pki_subsystem_name=
 ##  required information which MAY be overridden by users as necessary.      ##
 ###############################################################################
 [TPS]
-pki_subsystem=TPS
-pki_subsystem_name=