caddy-frontend: Name passed parameter correctly

"parameter_dict" says nothing, whereas "software_parameter_dict" explains
source and purpose of the information.

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 4ee9654b01dd99e36ed84ddb08814309
+md5sum = d1df1988d793357de74643771b3cd62a
 
 [profile-common]
 filename = instance-common.cfg.in
@@ -22,11 +22,11 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 584095eaee849764d55983beeb35c0e7
+md5sum = 70fba21c38c309d5237b972626faf096
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 74beef8d78df18e7fe9d5a6a3a9bf43c
+md5sum = 5fe2de2096fa9da9f549bd44e3c69c0e
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
@@ -114,7 +114,7 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = b5165126e373a488fa514a724d3b1d70
+md5sum = c8cfbfe7a2ef43cc7731f5ad9dd52d8d
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in

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

@@ -20,7 +20,7 @@ rendered = ${buildout:directory}/${:filename}
 extra-context =
 context =
     import json_module json
-    raw profile_common {{ parameter_dict['profile_common'] }}
+    raw profile_common {{ software_parameter_dict['profile_common'] }}
     ${:extra-context}
 
 {% set popen = functools_module.partial(subprocess_module.Popen, stdout=subprocess_module.PIPE, stderr=subprocess_module.STDOUT, stdin=subprocess_module.PIPE) %}
@@ -142,7 +142,7 @@ context =
 {%   for url_key in ['url', 'https-url'] %}
 {%     if url_key in slave %}
 {%       set url = (slave[url_key] or '').strip() %}
-{%       if subprocess_module.call([parameter_dict['caddy_backend_url_validator'], url]) == 1 or not validators.url(url) %}
+{%       if subprocess_module.call([software_parameter_dict['caddy_backend_url_validator'], url]) == 1 or not validators.url(url) %}
 {%         do slave_error_list.append('slave %s %r invalid' % (url_key, url)) %}
 {%       elif url != slave[url_key] %}
 {%         do slave_warning_list.append('slave %s %r has been converted to %r' % (url_key, slave[url_key], url)) %}
@@ -151,7 +151,7 @@ context =
 {%   endfor %}
 {%   if 'ssl_proxy_ca_crt' in slave %}
 {%     set ssl_proxy_ca_crt = slave.get('ssl_proxy_ca_crt', '') %}
-{%     set check_popen = popen([parameter_dict['openssl'], 'x509', '-noout']) %}
+{%     set check_popen = popen([software_parameter_dict['openssl'], 'x509', '-noout']) %}
 {%     do check_popen.communicate(ssl_proxy_ca_crt) %}
 {%     if check_popen.returncode != 0 %}
 {%       do slave_error_list.append('ssl_proxy_ca_crt is invalid') %}
@@ -167,8 +167,8 @@ context =
 {%     do slave_error_list.append('ssl_ca_crt is present, so ssl_crt and ssl_key are required')  %}
 {%   endif %}
 {%   if slave.get('ssl_key') and slave.get('ssl_crt') %}
-{%     set key_popen = popen([parameter_dict['openssl'], 'rsa', '-noout', '-modulus']) %}
-{%     set crt_popen = popen([parameter_dict['openssl'], 'x509', '-noout', '-modulus']) %}
+{%     set key_popen = popen([software_parameter_dict['openssl'], 'rsa', '-noout', '-modulus']) %}
+{%     set crt_popen = popen([software_parameter_dict['openssl'], 'x509', '-noout', '-modulus']) %}
 {%     set key_modulus = key_popen.communicate(slave['ssl_key'])[0] | trim %}
 {%     set crt_modulus = crt_popen.communicate(slave['ssl_crt'])[0] | trim %}
 {%     if not key_modulus or key_modulus != crt_modulus  %}
@@ -375,7 +375,7 @@ active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, so
 
 [dynamic-publish-slave-information]
 < = jinja2-template-base
-template = {{ parameter_dict['profile_replicate_publish_slave_information'] }}
+template = {{ software_parameter_dict['profile_replicate_publish_slave_information'] }}
 filename = dynamic-publish-slave-information.cfg
 extensions = jinja2.ext.do
 extra-context =
@@ -422,7 +422,7 @@ organization = {{ cluster_identification }}
 organizational_unit = Automatic Internal Kedifa Caucase CSR
 command =
   if [ ! -f ${:csr} ] && [ ! -f ${:key} ]  ; then
-    {{ parameter_dict['openssl'] }} req -new -sha256 \
+    {{ software_parameter_dict['openssl'] }} req -new -sha256 \
       -newkey rsa:2048 -nodes -keyout ${:key} \
       -subj "/O=${:organization}/OU=${:organizational_unit}" \
       -out ${:csr}
@@ -438,8 +438,8 @@ stop-on-error = True
 recipe = slapos.recipe.template:jinja2
 context =
   key caucase_url aikc-config:caucase-url
-template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
-  exec {{ parameter_dict['bin_directory'] }}/caucase \
+template = inline:#!{{ software_parameter_dict['dash'] }}/bin/dash
+  exec {{ software_parameter_dict['bin_directory'] }}/caucase \
 {# raw block to use context #}
 {% raw %}
   --ca-url {{ caucase_url }} \
@@ -472,7 +472,7 @@ command =
 {% do part_list.append('aikc-user-caucase-updater-promise') %}
 {{ caucase.updater(
      prefix='aikc-user-caucase-updater',
-     buildout_bin_directory=parameter_dict['bin_directory'],
+     buildout_bin_directory=software_parameter_dict['bin_directory'],
      updater_path='${directory:service}/aikc-user-caucase-updater',
      url='${aikc-config:caucase-url}',
      data_dir='${directory:srv}/caucase-updater',
@@ -503,7 +503,7 @@ recipe = slapos.recipe.template:jinja2
 context =
   key csr_id_url request-{{ csr }}:connection-csr_id-url
   key csr_id_certificate request-{{ csr }}:connection-csr_id-certificate
-template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
+template = inline:#!{{ software_parameter_dict['dash'] }}/bin/dash
   test -f ${directory:aikc}/{{ csr }}-done && exit 0
   ${buildout:executable} ${aikc-check-certificate:rendered} \
 {# raw block to use context #}
@@ -512,7 +512,7 @@ template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
   """{{ csr_id_certificate }}"""
 {% endraw %}
   if [ $? = 0 ]; then
-    csr_id=`{{ parameter_dict['curl'] }}/bin/curl -s -k -g \
+    csr_id=`{{ software_parameter_dict['curl'] }}/bin/curl -s -k -g \
 {% raw %}
   {{ csr_id_url }} \
 {% endraw %}
@@ -554,7 +554,7 @@ organization = {{ cluster_identification }}
 organizational_unit = Automatic Sign Backend Client Caucase CSR
 command =
   if [ ! -f ${:csr} ] && [ ! -f ${:key} ]  ; then
-    {{ parameter_dict['openssl'] }} req -new -sha256 \
+    {{ software_parameter_dict['openssl'] }} req -new -sha256 \
       -newkey rsa:2048 -nodes -keyout ${:key} \
       -subj "/O=${:organization}/OU=${:organizational_unit}" \
       -out ${:csr}
@@ -570,8 +570,8 @@ stop-on-error = True
 recipe = slapos.recipe.template:jinja2
 context =
   key caucase_url aibcc-config:caucase-url
-template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
-  exec {{ parameter_dict['bin_directory'] }}/caucase \
+template = inline:#!{{ software_parameter_dict['dash'] }}/bin/dash
+  exec {{ software_parameter_dict['bin_directory'] }}/caucase \
 {# raw block to use context #}
 {% raw %}
   --ca-url {{ caucase_url }} \
@@ -606,7 +606,7 @@ command =
 {% do part_list.append('aibcc-user-caucase-updater-promise') %}
 {{ caucase.updater(
      prefix='aibcc-user-caucase-updater',
-     buildout_bin_directory=parameter_dict['bin_directory'],
+     buildout_bin_directory=software_parameter_dict['bin_directory'],
      updater_path='${directory:service}/aibcc-user-caucase-updater',
      url='${aibcc-config:caucase-url}',
      data_dir='${directory:srv}/caucase-updater',
@@ -636,7 +636,7 @@ recipe = slapos.recipe.template:jinja2
 context =
   key csr_id_url request-{{ csr }}:connection-backend-client-csr_id-url
   key csr_id_certificate request-{{ csr }}:connection-csr_id-certificate
-template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
+template = inline:#!{{ software_parameter_dict['dash'] }}/bin/dash
   test -f ${directory:aibcc}/{{ csr }}-done && exit 0
   ${buildout:executable} ${aibcc-check-certificate:rendered} \
 {# raw block to use context #}
@@ -645,7 +645,7 @@ template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
   """{{ csr_id_certificate }}"""
 {% endraw %}
   if [ $? = 0 ]; then
-    csr_id=`{{ parameter_dict['curl'] }}/bin/curl -s -k -g \
+    csr_id=`{{ software_parameter_dict['curl'] }}/bin/curl -s -k -g \
 {% raw %}
   {{ csr_id_url }} \
 {% endraw %}
@@ -670,7 +670,7 @@ recipe = slapos.recipe.template:jinja2
 filename = rejected-slave.json
 directory = ${directory:promise-output}
 rendered = ${:directory}/${:filename}
-template = {{ parameter_dict['template_empty'] }}
+template = {{ software_parameter_dict['template_empty'] }}
 {% if rejected_slave_title_dict %}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 content = {{ dumps(json_module.dumps(rejected_slave_title_dict, indent=2, sort_keys=True)) }}
@@ -692,7 +692,7 @@ port = 14455
 directory = ${rejected-slave-json:directory}
 url = https://${rejected-slave-password:user}:${rejected-slave-password:passwd}@[${rejected-slave-publish-configuration:ip}]:${rejected-slave-publish-configuration:port}/${rejected-slave-json:filename}
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['caddy'] }}
+command-line = {{ software_parameter_dict['caddy'] }}
   -conf ${rejected-slave-template:rendered}
   -log stderr
   -http2=true
@@ -761,7 +761,7 @@ config-url = ${rejected-slave-publish:url}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 {{  caucase.caucased(
       prefix='caucased-backend-client',
-      buildout_bin_directory=parameter_dict['bin_directory'],
+      buildout_bin_directory=software_parameter_dict['bin_directory'],
       caucased_path='${directory:service}/caucased-backend-client',
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
@@ -773,8 +773,8 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [buildout]
 extends =
-  {{ parameter_dict['profile_common'] }}
-  {{ parameter_dict['profile_monitor2'] }}
+  {{ software_parameter_dict['profile_common'] }}
+  {{ software_parameter_dict['profile_monitor2'] }}
 parts =
   monitor-base
   publish-slave-information

software/caddy-frontend/instance-kedifa.cfg.in

@@ -3,9 +3,9 @@
 # KeDiFa instance profile
 [buildout]
 extends =
-  {{ parameter_dict['profile_common'] }}
-  {{ parameter_dict['profile_monitor'] }}
-  {{ parameter_dict['profile_logrotate_base'] }}
+  {{ software_parameter_dict['profile_common'] }}
+  {{ software_parameter_dict['profile_monitor'] }}
+  {{ software_parameter_dict['profile_logrotate_base'] }}
 
 parts =
   monitor-base
@@ -36,7 +36,7 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 {%  set caucase_url = 'http://' ~ caucase_netloc -%}
 {{  caucase.caucased(
       prefix='caucased',
-      buildout_bin_directory=parameter_dict['bin_directory'],
+      buildout_bin_directory=software_parameter_dict['bin_directory'],
       caucased_path='${directory:service}/caucased',
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
@@ -83,11 +83,11 @@ organization = {{ slapparameter_dict['cluster-identification'] }}
 organizational_unit = Kedifa Partition
 command =
   if [ ! -f ${:template-csr} ] && [ ! -f ${:key} ]  ; then
-    /bin/bash -c '{{ parameter_dict['openssl'] }} req -new -sha256 \
+    /bin/bash -c '{{ software_parameter_dict['openssl'] }} req -new -sha256 \
       -newkey rsa:2048 -nodes -keyout ${:key} \
       -subj "/O=${:organization}/OU=${:organizational_unit}" \
       -reqexts SAN \
-      -config <(cat {{ parameter_dict['openssl_cnf'] }} \
+      -config <(cat {{ software_parameter_dict['openssl_cnf'] }} \
       <(printf "\n[SAN]\nsubjectAltName=IP:${kedifa-config:ip}")) \
       -out ${:template-csr}'
   fi
@@ -98,7 +98,7 @@ stop-on-error = True
 
 {{ caucase.updater(
      prefix='caucase-updater',
-     buildout_bin_directory=parameter_dict['bin_directory'],
+     buildout_bin_directory=software_parameter_dict['bin_directory'],
      updater_path='${directory:service}/caucase-updater',
      url=caucase_url,
      data_dir='${directory:srv}/caucase-updater',
@@ -119,7 +119,7 @@ csr_work_path = ${directory:tmp}/${:_buildout_section_name_}
 stop-on-error = False
 update-command = ${:command}
 command =
-  {{ parameter_dict['bin_directory'] }}/caucase \
+  {{ software_parameter_dict['bin_directory'] }}/caucase \
     --ca-url {{ caucase_url }} \
     --ca-crt ${kedifa-config:ca-certificate} \
     --crl ${kedifa-config:crl} \
@@ -138,7 +138,7 @@ stop-on-error = True
 update-command = ${:command}
 command =
   if ! [ -f ${:key} ] && ! [ -f ${:certificate} ] ; then
-    {{ parameter_dict['openssl'] }} req -new -newkey rsa:2048 -sha256 -subj \
+    {{ software_parameter_dict['openssl'] }} req -new -newkey rsa:2048 -sha256 -subj \
       "/O=${kedifa-csr:organization}/OU=${kedifa-csr:organizational_unit}/CN={{ instance_parameter['ipv6-random'] }}" \
       -days 5 -nodes -x509 -keyout ${:key} -out ${:certificate}
   fi
@@ -171,7 +171,7 @@ config-port = ${expose-csr_id-configuration:port}
 [expose-csr_id]
 depends = ${store-csr_id:command}
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['caddy'] }}
+command-line = {{ software_parameter_dict['caddy'] }}
   -conf ${expose-csr_id-template:rendered}
   -log ${expose-csr_id-configuration:error-log}
   -http2=true
@@ -195,7 +195,7 @@ slapparameter_dict = {{ dumps(instance_parameter['configuration']) }}
 slap_software_type = {{ dumps(instance_parameter['slap-software-type']) }}
 context =
     import json_module json
-    raw profile_common {{ parameter_dict['profile_common'] }}
+    raw profile_common {{ software_parameter_dict['profile_common'] }}
     key slap_software_type :slap_software_type
     key slapparameter_dict :slapparameter_dict
     section directory directory
@@ -215,7 +215,7 @@ logfile = ${directory:log}/kedifa.log
 
 [kedifa-reloader]
 <= jinja2-template-base
-template = {{ parameter_dict['template_wrapper'] }}
+template = {{ software_parameter_dict['template_wrapper'] }}
 rendered = ${directory:etc-run}/kedifa-reloader
 command =
   kill -HUP `cat ${kedifa-config:pidfile}`
@@ -241,7 +241,7 @@ delaycompress =
 
 [kedifa]
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['kedifa'] }}
+command-line = {{ software_parameter_dict['kedifa'] }}
   --ip ${kedifa-config:ip}
   --port ${kedifa-config:port}
   --db ${kedifa-config:db}
@@ -268,7 +268,7 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 recipe = plone.recipe.command
 file = ${directory:reservation}/${:_buildout_section_name_}
 command =
-  [ ! -f ${:file} ] && {{ parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
+  [ ! -f ${:file} ] && {{ software_parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
 update-command = ${:command}
 
 [{{ slave_reference }}-auth-random]
@@ -283,7 +283,7 @@ commands =
 recipe = plone.recipe.command
 file = ${directory:reservation}/${:_buildout_section_name_}
 command =
-  [ ! -f ${:file} ] && {{ parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
+  [ ! -f ${:file} ] && {{ software_parameter_dict['curl'] }}/bin/curl -s -g -X POST https://[${kedifa-config:ip}]:${kedifa-config:port}/reserve-id --cert ${kedifa-config:certificate} --cacert ${kedifa-config:ca-certificate} > ${:file}.tmp && mv ${:file}.tmp ${:file}
 update-command = ${:command}
 
 [master-auth-random]

software/caddy-frontend/instance.cfg.in

 [buildout]
-extends = {{ template_frontend_parameter_dict['profile_common'] }}
+extends = {{ software_parameter_dict['profile_common'] }}
 
 parts =
   switch-softwaretype
@@ -16,7 +16,7 @@ context =
     key slapparameter_dict instance-parameter:configuration
     key slave_instance_list instance-parameter:slave-instance-list
     section instance_parameter instance-parameter
-    section parameter_dict dynamic-parameter-section
+    section software_parameter_dict software-parameter-section
     ${:extra-context}
 
 [switch-softwaretype]
@@ -29,27 +29,27 @@ single-custom-personal = ${dynamic-profile-caddy-frontend:rendered}
 replicate = ${dynamic-profile-caddy-replicate:rendered}
 kedifa = ${dynamic-profile-kedifa:rendered}
 
-[dynamic-parameter-section]
-{% for key,value in template_frontend_parameter_dict.iteritems() %}
+[software-parameter-section]
+{% for key,value in software_parameter_dict.iteritems() %}
 {{ key }} = {{ dumps(value) }}
 {% endfor -%}
 
 [dynamic-profile-caddy-frontend]
 < = jinja2-template-base
-template = {{ template_frontend_parameter_dict['profile_caddy_frontend'] }}
+template = {{ software_parameter_dict['profile_caddy_frontend'] }}
 filename = instance-caddy-frontend.cfg
 extensions = jinja2.ext.do
 extra-context =
   import furl_module furl
   raw software_type single-custom-personal
-caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
+caucase-jinja2-library = {{ software_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 
 [dynamic-profile-caddy-replicate]
 < = jinja2-template-base
 depends = ${caddyprofiledeps:recipe}
-template = {{ template_frontend_parameter_dict['profile_caddy_replicate'] }}
+template = {{ software_parameter_dict['profile_caddy_replicate'] }}
 filename = instance-caddy-replicate.cfg
 extensions = jinja2.ext.do
 extra-context =
@@ -59,18 +59,18 @@ extra-context =
     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
-caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
+caucase-jinja2-library = {{ software_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 
 [dynamic-profile-kedifa]
 < = jinja2-template-base
-template = {{ template_frontend_parameter_dict['profile_kedifa'] }}
+template = {{ software_parameter_dict['profile_kedifa'] }}
 filename = instance-kedifa.cfg
 extensions = jinja2.ext.do
 extra-context =
   raw software_type kedifa
-caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
+caucase-jinja2-library = {{ software_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 

software/caddy-frontend/software.cfg

@@ -82,7 +82,7 @@ context =
   key develop_eggs_directory buildout:develop-eggs-directory
   key eggs_directory buildout:eggs-directory
 
-[template-frontend-parameter-section]
+[software-parameter-section]
 # libraries
 caucase_jinja2_library = ${caucase-jinja2-library:target}
 
@@ -148,7 +148,7 @@ template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/template.cfg
 mode = 0644
 context =
-  section template_frontend_parameter_dict template-frontend-parameter-section
+  section software_parameter_dict software-parameter-section
 
 [profile-caddy-frontend]
 recipe = slapos.recipe.build:download