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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos
Commits
4eee6031
Commit
4eee6031
authored
Feb 21, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: address of default instance monitoring sent with slapos.cfg
Conflicts: software/slaprunner/instance-runner.cfg
parent
08b153f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+4
-0
software/slaprunner/template/slapos.cfg.in
software/slaprunner/template/slapos.cfg.in
+1
-0
No files found.
software/slaprunner/instance-runner.cfg
View file @
4eee6031
...
@@ -148,6 +148,8 @@ working-directory = $${runnerdirectory:home}
...
@@ -148,6 +148,8 @@ working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project}
project-directory = $${runnerdirectory:project}
software-directory = $${runnerdirectory:software-root}
software-directory = $${runnerdirectory:software-root}
instance-directory = $${runnerdirectory:instance-root}
instance-directory = $${runnerdirectory:instance-root}
#XXX-Nico hardcoded default port because overridden by this buildout config
instance-monitor-url = https://[$${:ipv6}]:9685
etc_dir = $${directory:etc}
etc_dir = $${directory:etc}
log_dir = $${directory:log}
log_dir = $${directory:log}
run_dir = $${directory:run}
run_dir = $${directory:run}
...
@@ -486,6 +488,8 @@ context =
...
@@ -486,6 +488,8 @@ context =
key debug slaprunner:debug
key debug slaprunner:debug
key etc_dir slaprunner:etc_dir
key etc_dir slaprunner:etc_dir
key git slaprunner:git-binary
key git slaprunner:git-binary
key instance_root runnerdirectory:instance-root
key instance_monitoring_url slaprunner:instance-monitor-url
key ipv4 slaprunner:ipv4
key ipv4 slaprunner:ipv4
key ipv6 slaprunner:ipv6
key ipv6 slaprunner:ipv6
key log_dir slaprunner:log_dir
key log_dir slaprunner:log_dir
...
...
software/slaprunner/template/slapos.cfg.in
View file @
4eee6031
...
@@ -17,6 +17,7 @@ supervisord_config = {{ supervisord_config }}
...
@@ -17,6 +17,7 @@ supervisord_config = {{ supervisord_config }}
runner_workdir = {{ runner_workdir }}
runner_workdir = {{ runner_workdir }}
runner_host = {{ ipv4 }}
runner_host = {{ ipv4 }}
runner_port = {{ runner_port }}
runner_port = {{ runner_port }}
instance_monitoring_url = {{ instance_monitoring_url }}
ipv4_address = {{ ipv4 }}
ipv4_address = {{ ipv4 }}
ipv6_address = {{ ipv6 }}
ipv6_address = {{ ipv6 }}
etc_dir = {{ etc_dir }}
etc_dir = {{ etc_dir }}
...
...
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