From 3373e99d61ada5384cf815fbfa7e0d738848a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Wed, 2 Sep 2020 15:05:29 +0200 Subject: [PATCH] caddy-frontend: Request real frontend for slave introspection --- software/caddy-frontend/buildout.hash.cfg | 2 +- .../caddy-frontend/instance-apache-frontend.cfg.in | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 8e69f0a47..5e3418889 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68 [template-apache-frontend] filename = instance-apache-frontend.cfg.in -md5sum = 43b3763d4086283e9c7c886e3b89e54b +md5sum = 2903ff177dd14433ef91e490763823fd [template-caddy-replicate] filename = instance-apache-replicate.cfg.in diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in index aa517b8c3..c6f1e6487 100644 --- a/software/caddy-frontend/instance-apache-frontend.cfg.in +++ b/software/caddy-frontend/instance-apache-frontend.cfg.in @@ -892,6 +892,16 @@ extra-context = key http_port configuration:plain_http_port key https_port configuration:port +[slave-introspection-frontend] +<= slap-connection +recipe = slapos.cookbook:requestoptional +name = Slave Introspection Frontend {{ instance_parameter['configuration.frontend-name'] }} +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg +slave = true +config-url = https://[${slap-network-information:global-ipv6}]:{{ instance_parameter['configuration.slave-introspection-https-port'] }}/ +config-https-only = true +return = domain secure_access + [configuration] {%- for key, value in instance_parameter.iteritems() -%} {%- if key.startswith('configuration.') %} -- 2.30.9