caddy-frontend: Reuse passed directory section

In context of frontend node reuse passed directory section to slave
configuration to improve readability and simplify future enhancements.

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 0851faa528eb4f21330a6f23f77dea7f
+md5sum = 89effc56e5517678b630f62b3477a460
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = 6d7113ebf0c46b0e4c72c128ebb647db
 
 [template-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 9da1616d203e4909af37e658aa923d95
+md5sum = 63eb20821549182a1ab7325604c30c1e
 
 [template-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in

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

@@ -210,7 +210,6 @@ kedifa-updater = {{ parameter_dict['kedifa-updater'] }}
 kedifa-updater-mapping-file = ${directory:etc}/kedifa_updater_mapping.txt
 kedifa-updater-state-file = ${directory:srv}/kedifa_updater_state.json
 kedifa-csr = {{ parameter_dict['kedifa-csr'] }}
-service_directory = ${directory:service}
 extra-context =
     key kedifa_caucase_ca_certificate kedifa-login-config:ca-certificate
     key kedifa_login_certificate kedifa-login-config:certificate
@@ -223,10 +222,6 @@ extra-context =
     key kedifa_csr :kedifa-csr
     key caddy_executable :caddy_executable
     key caucase_url :caucase_url
-    key directory_csr_id directory:csr_id
-    key directory_caddy_csr_id directory:caddy-csr_id
-    key directory_tmp directory:tmp
-    key directory_caddy_csr_id_log directory:caddy-csr_id-log
     key certificate_organization kedifa-login-csr:organization
     key certificate_organizational_unit kedifa-login-csr:organizational_unit
     key csr_id_csr caucase-updater-csr:csr
@@ -255,7 +250,6 @@ extra-context =
     section frontend_configuration frontend-configuration
     section caddy_configuration caddy-configuration
     key monitor_base_url monitor-instance-parameter:monitor-base-url 
-    key report_directory directory:bin
     key bin_directory :bin_directory
     key enable_http2_by_default configuration:enable-http2-by-default
     key global_disable_http2 configuration:global-disable-http2
@@ -266,12 +260,9 @@ extra-context =
     key access_log caddy-configuration:access-log
     key error_log caddy-configuration:error-log
     key sixtunnel_executable :sixtunnel_executable
-    key service_directory directory:service
-    key run_directory directory:etc-run
     key not_found_file caddy-configuration:not-found-file
     key custom_ssl_directory caddy-directory:custom-ssl-directory
 # BBB: SlapOS Master non-zero knowledge BEGIN
-    key bbb_ssl_directory directory:bbb-ssl-dir
     key apache_certificate apache-certificate:rendered
 # BBB: SlapOS Master non-zero knowledge END
 

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -196,7 +196,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }}
 {#-   Set Up Certs #}
 {%-   if 'ssl_key' in slave_instance and 'ssl_crt' in slave_instance %}
 {%-     set cert_title = '%s-crt' % (slave_reference) %}
-{%-     set cert_file = '/'.join([bbb_ssl_directory, cert_title.replace('-','.')]) %}
+{%-     set cert_file = '/'.join([directory['bbb-ssl-dir'], cert_title.replace('-','.')]) %}
 {%-     do kedifa_updater_mapping.append((key_download_url, certificate, cert_file)) %}
 {%-     do part_list.append(cert_title) %}
 {%-     do slave_parameter_dict.__setitem__("ssl_crt", cert_file) %}
@@ -317,7 +317,7 @@ extra-context =
 recipe = slapos.cookbook:wrapper
 ipv4 = ${slap-network-information:local-ipv4}
 ipv6 = ${slap-network-information:global-ipv6}
-wrapper-path = {{ service_directory}}/6tunnel-${:ipv6-port}
+wrapper-path = {{ directory['service'] }}/6tunnel-${:ipv6-port}
 command-line = {{ sixtunnel_executable }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
@@ -388,7 +388,7 @@ command-line = {{ kedifa_updater }}
   ${kedifa-updater-mapping:file}
   {{ kedifa_updater_state_file }}
 
-wrapper-path = {{ service_directory }}/kedifa-updater
+wrapper-path = {{ directory['service'] }}/kedifa-updater
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [kedifa-updater-run]
@@ -442,8 +442,8 @@ cache-access = {{ cache_access }}
 [store-csr_id]
 recipe = plone.recipe.command
 
-csr_id_path = {{ directory_csr_id }}/csr_id.txt
-csr_work_path = {{ directory_tmp }}/${:_buildout_section_name_}
+csr_id_path = {{ directory['csr_id'] }}/csr_id.txt
+csr_work_path = {{ directory['tmp'] }}/${:_buildout_section_name_}
 
 stop-on-error = False
 update-command = ${:command}
@@ -458,8 +458,8 @@ command =
 
 [certificate-csr_id]
 recipe = plone.recipe.command
-certificate = {{ directory_caddy_csr_id }}/certificate.pem
-key = {{ directory_caddy_csr_id }}/key.pem
+certificate = {{ directory['caddy-csr_id'] }}/certificate.pem
+key = {{ directory['caddy-csr_id'] }}/key.pem
 
 stop-on-error = True
 update-command = ${:command}
@@ -475,7 +475,7 @@ ip = ${slap-network-information:global-ipv6}
 port = 17001
 key = ${certificate-csr_id:key}
 certificate = ${certificate-csr_id:certificate}
-error-log = {{ directory_caddy_csr_id_log }}/expose-csr_id.log
+error-log = {{ directory['caddy-csr_id-log'] }}/expose-csr_id.log
 
 [expose-csr_id-template]
 recipe = slapos.recipe.template:jinja2
@@ -486,7 +486,7 @@ template = inline:
     log ${expose-csr_id-configuration:error-log}
   }
 
-rendered = {{ directory_caddy_csr_id }}/Caddyfile
+rendered = {{ directory['caddy-csr_id'] }}/Caddyfile
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
@@ -504,9 +504,9 @@ command-line = {{ caddy_executable }}
   -http2=true
   -disable-http-challenge
   -disable-tls-alpn-challenge
-  -root {{ directory_csr_id }}
+  -root {{ directory['csr_id'] }}
 
-wrapper-path = {{ service_directory }}/expose-csr_id
+wrapper-path = {{ directory['service'] }}/expose-csr_id
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [get-csr_id-certificate]