stack/lamp: Use modern monitor-publish

4bbc4921 · Łukasz Nowak · Łukasz Nowak · dcd2f8d6 · 4bbc4921 · 4bbc4921
Commit 4bbc4921 authored Oct 04, 2019 by Łukasz Nowak Committed by Łukasz Nowak Nov 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

stack/lamp/buildout.hash.cfg stack/lamp/buildout.hash.cfg +1 -1

stack/lamp/instance-lamp.cfg.jinja2.in stack/lamp/instance-lamp.cfg.jinja2.in +1 -4

No files found.
--- a/stack/lamp/buildout.hash.cfg
+++ b/stack/lamp/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 5212aed6c82876509eae9eda0975ffa1
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
-md5sum = fe0fd8b6691323053b06f72701a3c82b
+md5sum = 39e765fca5fcd92cb9fa13cd2b4d95fd
 [template-apache.conf]
 filename = apache.conf.in

--- a/stack/lamp/instance-lamp.cfg.jinja2.in
+++ b/stack/lamp/instance-lamp.cfg.jinja2.in
@@ -105,14 +105,11 @@ password = ${publish-early:monitor-password}
 [monitor-conf-parameters]
 [publish-connection-information]
+<= monitor-publish
 recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}
-{% 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-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
-monitor-password = ${publish-early:monitor-password}
-monitor-user = ${monitor-publish-parameters:monitor-user}
 {% do part_list.append('monitor-base') -%}
 [buildout]