Commit a5ae56ed authored by Marco Mariani's avatar Marco Mariani

abilian: extranet service + promise

parent c763596c
...@@ -14,6 +14,8 @@ EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance} ...@@ -14,6 +14,8 @@ EXTRANET_INSTANCE_PATH=$${directories:extranet_spr-instance}
ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered} ABILIAN_CONFIG_EXTRA_PYTHON=$${config-staging-py:rendered}
ABILIAN_CONFIG_EXTRA_JSON=$${buildout:directory}/partition-parameters.json:$${json-extra-configuration:json-output} ABILIAN_CONFIG_EXTRA_JSON=$${buildout:directory}/partition-parameters.json:$${json-extra-configuration:json-output}
LD_LIBRARY_PATH=${cairo:location}/lib:${glib:location}/lib:${pango:location}/lib LD_LIBRARY_PATH=${cairo:location}/lib:${glib:location}/lib:${pango:location}/lib
# abilian/services/conversion.py does not like it, if PATH does not exist
PATH=/usr/sbin:/usr/bin:/sbin:/bin
...@@ -29,6 +31,7 @@ inline = ...@@ -29,6 +31,7 @@ inline =
export ABILIAN_CONFIG_EXTRA_PYTHON=$${instance-environment:ABILIAN_CONFIG_EXTRA_PYTHON} export ABILIAN_CONFIG_EXTRA_PYTHON=$${instance-environment:ABILIAN_CONFIG_EXTRA_PYTHON}
export ABILIAN_CONFIG_EXTRA_JSON=$${instance-environment:ABILIAN_CONFIG_EXTRA_JSON} export ABILIAN_CONFIG_EXTRA_JSON=$${instance-environment:ABILIAN_CONFIG_EXTRA_JSON}
export LD_LIBRARY_PATH=$${instance-environment:LD_LIBRARY_PATH} export LD_LIBRARY_PATH=$${instance-environment:LD_LIBRARY_PATH}
export PATH=$${instance-environment:PATH}
output = $${buildout:directory}/environment.sh output = $${buildout:directory}/environment.sh
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
parts = parts =
extranet-symlinks extranet-symlinks
extranet-service
extranet-promise
config-staging-py config-staging-py
...@@ -12,6 +14,27 @@ link-binary = ...@@ -12,6 +14,27 @@ link-binary =
${buildout:directory}/bin/abilian ${buildout:directory}/bin/abilian
[extranet-service]
recipe = slapos.recipe.template:jinja2
template = inline:
#!/bin/sh
. {{environment}}
exec {{abilian}} run
rendered = $${directories:services}/abilian-start
mode = 700
context =
raw environment $${buildout:directory}/environment.sh
raw abilian ${buildout:directory}/bin/abilian
[extranet-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directories:promises}/extranet
hostname = $${instance-parameters:ipv6-random}
port = 5000
[config-staging-py] [config-staging-py]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${config-staging-py-template:location}/${config-staging-py-template:filename} template = ${config-staging-py-template:location}/${config-staging-py-template:filename}
...@@ -20,3 +43,4 @@ mode = 600 ...@@ -20,3 +43,4 @@ mode = 600
#context = #context =
# section config config-staging # section config config-staging
...@@ -17,6 +17,8 @@ parts = ...@@ -17,6 +17,8 @@ parts =
postgres-promise postgres-promise
postgres-symlinks postgres-symlinks
extranet-symlinks extranet-symlinks
extranet-service
extranet-promise
config-staging-py config-staging-py
json-configuration json-configuration
json-extra-configuration json-extra-configuration
......
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