Commit c241fa7d authored by Stefane Fermigier's avatar Stefane Fermigier

WIP.

parent 29da751e
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 4c105941aa39a73e689e35dd9cdbb1f3 md5sum = d85d1229a01d1602d4897d817fad05f6
[buildout] [buildout]
parts = parts =
# monitor-base
publish-connection-parameter publish-connection-parameter
proxy-promise
# Define egg directories to be the one from Software Release # Define egg directories to be the one from Software Release
# (/opt/slapgrid/...) # (/opt/slapgrid/...)
...@@ -9,6 +11,8 @@ eggs-directory = {{ buildout['eggs-directory'] }} ...@@ -9,6 +11,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 = {{ template_monitor }}
[slap-configuration] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration recipe = slapos.cookbook:slapconfiguration
...@@ -43,10 +47,18 @@ port = 3001 ...@@ -43,10 +47,18 @@ port = 3001
wrapper-path = ${directory:service}/mynij-proxy wrapper-path = ${directory:service}/mynij-proxy
[proxy-promise]
<= monitor-promise-base
module = check_port_listening
name = proxy-port-listening.py
config-hostname= ${proxy-service:host}
config-port = ${proxy-service:port}
# Publish all the parameters needed for the user to connect to the instance. # Publish all the parameters needed for the user to connect to the instance.
# It can be anything: URL(s), password(s), or arbitrary parameters. # It can be anything: URL(s), password(s), or arbitrary parameters.
# Here we'll just echo back the entered name as instance parameter # Here we'll just echo back the entered name as instance parameter
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
<= monitor-publish
url = http://[${proxy-service:host}]:${proxy-service:port} url = http://[${proxy-service:host}]:${proxy-service:port}
...@@ -6,9 +6,9 @@ extends = ...@@ -6,9 +6,9 @@ extends =
buildout.hash.cfg buildout.hash.cfg
# "slapos" stack describes basic things needed for 99.9% of SlapOS Software # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
# Releases # Releases
../../stack/slapos.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
; ../../stack/monitor/buildout.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
# Extend here component profiles, like openssl, apache, mariadb, curl... # Extend here component profiles, like openssl, apache, mariadb, curl...
# Or/and extend a stack (lamp, tomcat) that does most of the work for you # Or/and extend a stack (lamp, tomcat) that does most of the work for you
# In this example we extend from helloweb component. # In this example we extend from helloweb component.
...@@ -66,7 +66,7 @@ context = ...@@ -66,7 +66,7 @@ context =
section buildout buildout section buildout buildout
key mynij_proxy_location mynij-proxy-repository:location key mynij_proxy_location mynij-proxy-repository:location
raw gunicorn_bin ${buildout:bin-directory}/gunicorn raw gunicorn_bin ${buildout:bin-directory}/gunicorn
raw template_monitor ${monitor2-template:rendered}
[versions] [versions]
gunicorn = 20.1.0 gunicorn = 20.1.0
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