Commit 37e88c89 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Set same monitor password on all instances

This allows to use monitor-setup-url correctly.
parent 6e985ada
......@@ -22,11 +22,11 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
md5sum = 7dbceb62d845b7951c3c9efa8c3d5bf6
md5sum = 48fb25df53d1465f4c95d1d9c39c40d2
[template-caddy-replicate]
filename = instance-apache-replicate.cfg.in
md5sum = 3ada9a41527c6d457798890422b67176
md5sum = c906045aee1867970b142f72eda4723a
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
......@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
[template-kedifa]
filename = instance-kedifa.cfg.in
md5sum = e8d3d7dfe78682f8bcf4b308165d2971
md5sum = 7814a48cc05d25c8f2d7b527ef2485b5
......@@ -683,6 +683,7 @@ config-port = ${caddy-configuration:ssl-cache-through-port}
# directly, and in our case it can come from the network, thus resulting
# with need to strip !py!'u'
monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
password = {{ instance_parameter['configuration.monitor-password'] | string }}
[monitor-conf-parameters]
private-path-list +=
......
......@@ -209,13 +209,19 @@ context =
[monitor-instance-parameter]
monitor-httpd-port = {{ master_partition_monitor_monitor_httpd_port }}
password = ${publish-early:monitor-password}
[publish-early]
recipe = slapos.cookbook:publish-early
-init =
monitor-password monitor-htpasswd:passwd
[replicate]
<= slap-connection
recipe = slapos.cookbook:requestoptional.serialised
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${monitor-htpasswd:passwd}
config-monitor-password = ${publish-early:monitor-password}
{% set frontend_software_url_key = "-frontend-software-release-url" %}
{% if slapparameter_dict.has_key(frontend_software_url_key) %}
......@@ -310,7 +316,7 @@ custom-group = ${dynamic-publish-slave-information:rendered}
recipe = slapos.cookbook:requestoptional.serialised
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${monitor-htpasswd:passwd}
config-monitor-password = ${publish-early:monitor-password}
config-monitor-httpd-port = {{ kedifa_partition_monitor_httpd_port }}
{% for key in ['kedifa_port', 'caucase_port'] -%}
{%- if key in slapparameter_dict %}
......
......@@ -25,6 +25,7 @@ parts =
# directly, and in our case it can come from the network, thus resulting
# with need to strip !py!'u'
monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
password = {{ instance_parameter['configuration.monitor-password'] | string }}
[caucased]
hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment