From 5e720d5b52d93a171a4213138e0454eba95a280a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 8 Oct 2020 12:06:53 +0200 Subject: [PATCH] caddy-frontend: Share parameter_dict --- software/caddy-frontend/buildout.hash.cfg | 2 +- software/caddy-frontend/instance.cfg.in | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 9cfcb49a0..e9a291eef 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [template] filename = instance.cfg.in -md5sum = 9540d96bf8fe36091b44b9d6a515b45d +md5sum = 759be07fcebb20f855caf40750fbb59a [profile-common] filename = instance-common.cfg.in diff --git a/software/caddy-frontend/instance.cfg.in b/software/caddy-frontend/instance.cfg.in index 7c24cb62a..84b999ab7 100644 --- a/software/caddy-frontend/instance.cfg.in +++ b/software/caddy-frontend/instance.cfg.in @@ -17,6 +17,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 ${:extra-context} [switch-softwaretype] @@ -41,7 +42,6 @@ filename = instance-caddy-frontend.cfg extensions = jinja2.ext.do extra-context = import furl_module furl - section parameter_dict dynamic-parameter-section raw software_type single-custom-personal caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }} import-list = @@ -64,7 +64,6 @@ extra-context = raw software_type RootSoftwareInstance-default-custom-personal-replicate raw profile_monitor2 {{ template_frontend_parameter_dict['profile_monitor2'] }} raw profile_common {{ template_frontend_parameter_dict['profile_common'] }} - section parameter_dict dynamic-parameter-section caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }} import-list = file caucase :caucase-jinja2-library @@ -75,7 +74,6 @@ template = {{ template_frontend_parameter_dict['profile_kedifa'] }} filename = instance-kedifa.cfg extensions = jinja2.ext.do extra-context = - section parameter_dict dynamic-parameter-section raw software_type kedifa caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }} import-list = -- 2.30.9