caddy-frontend: Reuse instance_parameter_dict more

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 011889ce0d72c5986eddf27760446331
+md5sum = 28bf0c4c75c028bed79fc38786831b3e
 
 [profile-common]
 filename = instance-common.cfg.in
@@ -26,7 +26,7 @@ md5sum = 48d549d1327859cac83536806de8ee99
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 9baf4802354309b99d58e45028c90d0f
+md5sum = 4d4ace1bdad5adcf64d8dbf11d2fa21d
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -230,7 +230,7 @@ config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-infor
 config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
 config-backend-client-caucase-url = {{ caucase_url }}
 config-master-key-download-url = ${request-kedifa:connection-master-key-download-url}
-config-cluster-identification = {{ cluster_identification }}
+config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
 {#   Do not send additional parameters for destroyed nodes #}
 {%   if state != 'destroyed' %}
 {%     set slave_configuration_dict = slapparameter_dict %}
@@ -327,7 +327,7 @@ config-{{ key }} = {{ dumps(slapparameter_dict[key]) }}
 {%-   endif %}
 {%- endfor %}
 config-slave-list = {{ dumps(authorized_slave_list) }}
-config-cluster-identification = {{ cluster_identification }}
+config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
 
 {% set software_url_key = "-kedifa-software-release-url" %}
 {% if slapparameter_dict.has_key(software_url_key) %}
@@ -418,7 +418,7 @@ csr_id = ${directory:aikc}/csr_id
 
 [aikc-user-csr]
 recipe = plone.recipe.command
-organization = {{ cluster_identification }}
+organization = {{ instance_parameter_dict['root-instance-title'] }}
 organizational_unit = Automatic Internal Kedifa Caucase CSR
 command =
   if [ ! -f ${:csr} ] && [ ! -f ${:key} ]  ; then
@@ -550,7 +550,7 @@ csr_id = ${directory:aibcc}/csr_id
 
 [aibcc-user-csr]
 recipe = plone.recipe.command
-organization = {{ cluster_identification }}
+organization = {{ instance_parameter_dict['root-instance-title'] }}
 organizational_unit = Automatic Sign Backend Client Caucase CSR
 command =
   if [ ! -f ${:csr} ] && [ ! -f ${:key} ]  ; then

software/caddy-frontend/instance.cfg.in

@@ -54,7 +54,6 @@ extra-context =
     import subprocess_module subprocess
     import functools_module functools
     import validators validators
-    key cluster_identification instance-parameter:root-instance-title
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type RootSoftwareInstance-default-custom-personal-replicate