caddy-frontend: Simplify software.cfg and instance.cfg.in definitions

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = bfb647325103640c19c38e7b7f6e2833
+md5sum = 5870881f37b6aa0f112d68f24472c64d
 
 [template-common]
 filename = instance-common.cfg.in

software/caddy-frontend/instance.cfg.in

 [buildout]
-extends = {{ common_profile }}
+extends = {{ template_frontend_parameter_dict['common_profile'] }}
 
 parts =
   dynamic-template-caddy-replicate
@@ -30,28 +30,28 @@ single-custom-personal = ${dynamic-template-caddy-frontend:rendered}
 replicate = ${dynamic-template-caddy-replicate:rendered}
 kedifa = ${dynamic-template-kedifa:rendered}
 
-[dynamic-template-caddy-frontend-parameters]
+[dynamic-parameter-section]
 {% for key,value in template_frontend_parameter_dict.iteritems() %}
 {{ key }} = {{ dumps(value) }}
 {% endfor -%}
 
 [dynamic-template-caddy-frontend]
 < = jinja2-template-base
-template = {{ template_caddy_frontend }}
+template = {{ template_frontend_parameter_dict['template_caddy_frontend'] }}
 filename = instance-caddy-frontend.cfg
 extensions = jinja2.ext.do
 extra-context =
   import furl_module furl
-  section parameter_dict dynamic-template-caddy-frontend-parameters
+  section parameter_dict dynamic-parameter-section
   raw software_type single-custom-personal
-caucase-jinja2-library = {{ caucase_jinja2_library }}
+caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 
 [dynamic-template-caddy-replicate]
 < = jinja2-template-base
 depends = ${caddyprofiledeps:recipe}
-template = {{ template_caddy_replicate }}
+template = {{ template_frontend_parameter_dict['template_caddy_replicate'] }}
 filename = instance-caddy-replicate.cfg
 extensions = jinja2.ext.do
 extra-context =
@@ -59,26 +59,26 @@ extra-context =
     import functools_module functools
     import validators validators
     key cluster_identification instance-parameter:root-instance-title
-    raw caddy_backend_url_validator {{ caddy_backend_url_validator }}
-    raw template_publish_slave_information {{ template_replicate_publish_slave_information }}
+    raw caddy_backend_url_validator {{ template_frontend_parameter_dict['caddy_backend_url_validator'] }}
+    raw template_publish_slave_information {{ template_frontend_parameter_dict['template_replicate_publish_slave_information'] }}
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type RootSoftwareInstance-default-custom-personal-replicate
-    raw template_monitor {{ monitor2_template }}
-    raw common_profile {{ common_profile }}
-    section parameter_dict dynamic-template-caddy-frontend-parameters
-caucase-jinja2-library = {{ caucase_jinja2_library }}
+    raw template_monitor {{ template_frontend_parameter_dict['template_monitor2'] }}
+    raw common_profile {{ template_frontend_parameter_dict['common_profile'] }}
+    section parameter_dict dynamic-parameter-section
+caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 
 [dynamic-template-kedifa]
 < = jinja2-template-base
-template = {{ template_kedifa }}
+template = {{ template_frontend_parameter_dict['template_kedifa'] }}
 filename = instance-kedifa.cfg
 extensions = jinja2.ext.do
 extra-context =
-  section parameter_dict dynamic-template-caddy-frontend-parameters
+  section parameter_dict dynamic-parameter-section
   raw software_type kedifa
-caucase-jinja2-library = {{ caucase_jinja2_library }}
+caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
 import-list =
   file caucase :caucase-jinja2-library
 

software/caddy-frontend/software.cfg

@@ -21,14 +21,8 @@ extends =
 parts +=
   caucase-eggs
   template
-  template-caddy-frontend
-  template-caddy-replicate
-  caddy
-
-  logrotate
   rdiff-backup
   caddyprofiledeps
-
   kedifa-develop
   kedifa
 
@@ -89,11 +83,44 @@ context =
   key eggs_directory buildout:eggs-directory
 
 [template-frontend-parameter-section]
+# libraries
+caucase_jinja2_library = ${caucase-jinja2-library:target}
+
+# profiles
 common_profile = ${template-common:rendered}
+template_caddy_frontend = ${template-caddy-frontend:target}
+template_caddy_replicate = ${template-caddy-replicate:target}
+template_replicate_publish_slave_information = ${template-replicate-publish-slave-information:target}
+template_slave_list = ${template-slave-list:target}
+template_kedifa = ${template-kedifa:target}
+
+# templates
 logrotate_base_instance = ${template-logrotate-base:rendered}
+monitor_template = ${monitor-template:output}
+template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
+template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
+template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
+template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
+template_configuration_state_script = ${template-configuration-state-script:target}
+template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
+template_empty = ${template-empty:target}
+template_graceful_script = ${template-graceful-script:target}
+template_log_access = ${template-log-access:target}
+template_monitor2 = ${monitor2-template:rendered}
+template_not_found_html = ${template-not-found-html:target}
+template_rotate_script = ${template-rotate-script:target}
+template_slave_introspection_httpd_nginx = ${template-slave-introspection-httpd-nginx:target}
+template_trafficserver_logging_yaml = ${template-trafficserver-logging-yaml:target}
+template_trafficserver_records_config = ${template-trafficserver-records-config:target}
+template_trafficserver_storage_config = ${template-trafficserver-storage-config:target}
+template_validate_script = ${template-validate-script:target}
+template_wrapper = ${template-wrapper:output}
+caddy_backend_url_validator = ${caddy-backend-url-validator:output}
 
+# directories
 bin_directory = ${buildout:bin-directory}
 
+# files
 sixtunnel = ${6tunnel:location}
 nginx = ${nginx-output:nginx}
 nginx_mime = ${nginx-output:mime}
@@ -115,43 +142,13 @@ kedifa-csr = ${:bin_directory}/kedifa-csr
 xz_location = ${xz-utils:location}
 htpasswd = ${:bin_directory}/htpasswd
 
-monitor_template = ${monitor-template:output}
-template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
-template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
-template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
-template_graceful_script = ${template-graceful-script:target}
-template_validate_script = ${template-validate-script:target}
-template_rotate_script = ${template-rotate-script:target}
-template_configuration_state_script = ${template-configuration-state-script:target}
-template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
-template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
-template_empty = ${template-empty:target}
-template_log_access = ${template-log-access:target}
-template_not_found_html = ${template-not-found-html:target}
-template_slave_list = ${template-slave-list:target}
-template_trafficserver_records_config = ${template-trafficserver-records-config:target}
-template_trafficserver_storage_config = ${template-trafficserver-storage-config:target}
-template_trafficserver_logging_yaml = ${template-trafficserver-logging-yaml:target}
-template_wrapper = ${template-wrapper:output}
-template_slave_introspection_httpd_nginx = ${template-slave-introspection-httpd-nginx:target}
-
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/template.cfg
 mode = 0644
 context =
-  key common_profile template-common:rendered
-
-  key monitor2_template monitor2-template:rendered
-  key template_caddy_frontend template-caddy-frontend:target
-  key template_caddy_replicate template-caddy-replicate:target
-  key template_kedifa template-kedifa:target
-  key template_replicate_publish_slave_information template-replicate-publish-slave-information:target
-  key caddy_backend_url_validator caddy-backend-url-validator:output
-
   section template_frontend_parameter_dict template-frontend-parameter-section
-  key caucase_jinja2_library caucase-jinja2-library:target
 
 [template-caddy-frontend]
 recipe = slapos.recipe.build:download