Commit ca9f52c4 authored by Lu Xu's avatar Lu Xu 👀

wip

parent 160bddea
...@@ -6,6 +6,8 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -6,6 +6,8 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
extends = {{ monitor_template }}
[slap-configuration] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised recipe = slapos.cookbook:slapconfiguration.serialised
computer = $${slap-connection:computer-id} computer = $${slap-connection:computer-id}
...@@ -238,6 +240,7 @@ context = ...@@ -238,6 +240,7 @@ context =
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
output = ${monitor-directory:public}/gadget/$${:filename} output = ${monitor-directory:public}/gadget/$${:filename}
content = content =
raw monitor_template ${monitor2-template:output}
raw $${:filename} ${$${:filename}:target} raw $${:filename} ${$${:filename}:target}
[promise-gadget-js] [promise-gadget-js]
......
...@@ -318,6 +318,7 @@ monitor-base-url = ${monitor-base:base-url} ...@@ -318,6 +318,7 @@ monitor-base-url = ${monitor-base:base-url}
monitor-url = ${:monitor-base-url}/public/feeds monitor-url = ${:monitor-base-url}/public/feeds
monitor-user = ${monitor-instance-parameter:username} monitor-user = ${monitor-instance-parameter:username}
monitor-password = ${monitor-instance-parameter:password} monitor-password = ${monitor-instance-parameter:password}
monitor-gadget-url = ${:monitor-base-url}/public/gadget/
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-title = ${slap-configuration:instance-title} monitor-title = ${slap-configuration:instance-title}
...@@ -427,7 +428,7 @@ depends = ...@@ -427,7 +428,7 @@ depends =
[monitor-publish] [monitor-publish]
monitor-base-url = ${monitor-publish-parameters:monitor-base-url} monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password} monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
monitor-gadget-url =${monitor-publish-parameters:monitor-gadget-url}
[buildout] [buildout]
......
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