From 522471f212f7c459d8cb53a28ca4d3a325807f5f Mon Sep 17 00:00:00 2001 From: Lukasz Nowak <luke@nexedi.com> Date: Tue, 9 Jul 2019 13:06:39 +0200 Subject: [PATCH] caddy-frontend: Add Kedifa partition to monitored list Due to missing monitor frontend in tests this change is not covered by tests. /reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/592 --- software/caddy-frontend/buildout.hash.cfg | 2 +- software/caddy-frontend/instance-apache-replicate.cfg.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index a00541295..162e23de1 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -26,7 +26,7 @@ md5sum = 72e8ff0773fd0325dcbe994786156570 [template-caddy-replicate] filename = instance-apache-replicate.cfg.in -md5sum = 99ec567c429ff82571d08818eaaed390 +md5sum = 6ef06ef36dbb0c3ba1ea8841bcd49330 [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in diff --git a/software/caddy-frontend/instance-apache-replicate.cfg.in b/software/caddy-frontend/instance-apache-replicate.cfg.in index f9996b0bb..17596570c 100644 --- a/software/caddy-frontend/instance-apache-replicate.cfg.in +++ b/software/caddy-frontend/instance-apache-replicate.cfg.in @@ -295,7 +295,7 @@ software-url = ${slap-connection:software-release-url} {% endif %} software-type = kedifa name = kedifa -return = slave-kedifa-information master-key-generate-auth-url master-key-upload-url master-key-download-url caucase-url csr_id-url csr_id-certificate +return = slave-kedifa-information master-key-generate-auth-url master-key-upload-url master-key-download-url caucase-url csr_id-url csr_id-certificate monitor-base-url {% set sla_kedifa_key = "-sla-kedifa-" %} {% set sla_kedifa_key_length = sla_kedifa_key | length %} {% for key in slapparameter_dict.keys() %} @@ -342,6 +342,7 @@ extra-context = [monitor-conf-parameters] monitor-url-list += + ${request-kedifa:connection-monitor-base-url} {% for frontend in frontend_section_list %} {{ ' ${' + frontend + ':connection-monitor-base-url}' }} {% endfor %} -- 2.30.9