Commit bf16d268 authored by Alain Takoudjou's avatar Alain Takoudjou

apache-frontend: fix monitor published connection parameters

parent 949a7209
...@@ -23,7 +23,7 @@ md5sum = b6a2c860ea1cd4bc9d185c7108c52d0a ...@@ -23,7 +23,7 @@ md5sum = b6a2c860ea1cd4bc9d185c7108c52d0a
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
md5sum = c55506cfb92d87f915d50d32fb129a28 md5sum = 9e76028df7e93d3e32982884d5dc0913
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
......
...@@ -114,19 +114,13 @@ sla-{{ parameter }} = {{ value }} ...@@ -114,19 +114,13 @@ sla-{{ parameter }} = {{ value }}
[publish-information] [publish-information]
<= monitor-publish
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
domain = {{ slapparameter_dict.get('domain') }} domain = {{ slapparameter_dict.get('domain') }}
slave-amount = {{ slave_instance_list | length }} slave-amount = {{ slave_instance_list | length }}
accepted-slave-amount = {{ authorized_slave_list | length }} accepted-slave-amount = {{ authorized_slave_list | length }}
rejected-slave-amount = {{ rejected_slave_list | length }} rejected-slave-amount = {{ rejected_slave_list | length }}
rejected-slave-list = {{ json_module.dumps(rejected_slave_list) }} rejected-slave-list = {{ json_module.dumps(rejected_slave_list) }}
monitor-base-url = ${monitor-conf-parameters:base-url}
monitor-url = ${:monitor-base-url}/public/feeds
monitor-user = ${monitor-instance-parameter:username}
monitor-password = ${monitor-instance-parameter:password}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${:monitor-url}
#---------------------------- #----------------------------
#-- #--
......
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