Commit 8b4c6ed5 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

fixup! caddy-frontend: Pass monitor-httpd-port on request

There is a way to pass monitor port to each replicated frontend by using
frontend-config-N-monitor-httpd-port, thus there is no need to pass through
the default value, as it comes default on each replicated slave.
parent 6877d695
No related merge requests found
...@@ -26,7 +26,7 @@ md5sum = 5cfc4dd69c2800906d6648c626023cf0 ...@@ -26,7 +26,7 @@ md5sum = 5cfc4dd69c2800906d6648c626023cf0
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
md5sum = 3c6ac85aa0f9f4692eb8a9af00ecfbd0 md5sum = 1cf98844e5daf75a74514dbb292d6506
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
......
...@@ -99,7 +99,6 @@ recipe = slapos.cookbook:requestoptional.serialised ...@@ -99,7 +99,6 @@ recipe = slapos.cookbook:requestoptional.serialised
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username} config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${monitor-htpasswd:passwd} config-monitor-password = ${monitor-htpasswd:passwd}
config-monitor-httpd-port = {{ slapparameter_dict.get('monitor-httpd-port', '8196') }}
{% set frontend_software_url_key = "-frontend-software-release-url" %} {% set frontend_software_url_key = "-frontend-software-release-url" %}
{% if slapparameter_dict.has_key(frontend_software_url_key) %} {% if slapparameter_dict.has_key(frontend_software_url_key) %}
......
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