Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stephane VAROQUI
slapos
Commits
0c9abf3b
Commit
0c9abf3b
authored
Sep 27, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Nov 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/re6stnet: Switch to monitor-promise-base
parent
0855e3d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
software/re6stnet/buildout.hash.cfg
software/re6stnet/buildout.hash.cfg
+1
-1
software/re6stnet/instance-re6stnet.cfg.in
software/re6stnet/instance-re6stnet.cfg.in
+10
-9
No files found.
software/re6stnet/buildout.hash.cfg
View file @
0c9abf3b
...
@@ -18,7 +18,7 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a
...
@@ -18,7 +18,7 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a
[template-re6stnet]
[template-re6stnet]
filename = instance-re6stnet.cfg.in
filename = instance-re6stnet.cfg.in
md5sum =
73c8fad6db7c711b0822891aba574564
md5sum =
ee582dbab92c1c452874ddca3831aef6
[template-apache-conf]
[template-apache-conf]
filename = apache.conf.in
filename = apache.conf.in
...
...
software/re6stnet/instance-re6stnet.cfg.in
View file @
0c9abf3b
...
@@ -18,7 +18,6 @@ var = ${buildout:directory}/var
...
@@ -18,7 +18,6 @@ var = ${buildout:directory}/var
log = ${:var}/log
log = ${:var}/log
services = ${:etc}/service
services = ${:etc}/service
script = ${:etc}/run
script = ${:etc}/run
promises = ${:etc}/promise
run = ${:var}/run
run = ${:var}/run
ca-dir = ${:etc}/ssl
ca-dir = ${:etc}/ssl
requests = ${:ca-dir}/requests
requests = ${:ca-dir}/requests
...
@@ -202,16 +201,18 @@ context =
...
@@ -202,16 +201,18 @@ context =
section parameter_dict re6st-registry-conf-dict
section parameter_dict re6st-registry-conf-dict
[re6st-registry-promise]
[re6st-registry-promise]
recipe = slapos.cookbook:check_port_listening
<= monitor-promise-base
path = ${directory:promises}/re6st-registry
module = check_port_listening
hostname = ${re6st-registry:ipv4}
name = re6st-registry.py
port = ${re6st-registry:port}
config-hostname = ${re6st-registry:ipv4}
config-port = ${re6st-registry:port}
[apache-registry-promise]
[apache-registry-promise]
recipe = slapos.cookbook:check_port_listening
<= monitor-promise-base
path = ${directory:promises}/apache-re6st-registry
module = check_port_listening
hostname = ${apache-conf:ipv6}
name = apache-re6st-registry.py
port = ${apache-conf:port}
config-hostname = ${apache-conf:ipv6}
config-port = ${apache-conf:port}
{% do publish_dict.__setitem__('re6stry-url', uri_scheme ~ '://[${apache-conf:ipv6}]:${apache-conf:port}') -%}
{% do publish_dict.__setitem__('re6stry-url', uri_scheme ~ '://[${apache-conf:ipv6}]:${apache-conf:port}') -%}
{% do publish_dict.__setitem__('re6stry-local-url', 'http://${re6st-registry:ipv4}:${re6st-registry:port}/') -%}
{% do publish_dict.__setitem__('re6stry-local-url', 'http://${re6st-registry:ipv4}:${re6st-registry:port}/') -%}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment