Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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-caddy
Commits
e69b012f
Commit
e69b012f
authored
Feb 24, 2014
by
Nicolas Wavrant
Committed by
Cédric Le Ninivin
Apr 29, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file
parent
2365bbe9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+5
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-0
software/slaprunner/template/slapos.cfg.in
software/slaprunner/template/slapos.cfg.in
+1
-0
No files found.
software/slaprunner/common.cfg
View file @
e69b012f
...
@@ -44,7 +44,7 @@ mode = 0644
...
@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
c66f18b74b958805bb2196fb1c54683e
md5sum =
89d3e017ace46f2f86f2abd962e2db5a
mode = 0644
mode = 0644
[instance-runner-import]
[instance-runner-import]
...
@@ -103,7 +103,11 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -103,7 +103,11 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template]
[slapos-cfg-template]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
url = ${:_profile_base_location_}/template/${:filename}
<<<<<<< HEAD
md5sum = d31d1c51a51bc4b2b8dda197777a4bcb
md5sum = d31d1c51a51bc4b2b8dda197777a4bcb
=======
md5sum = 65dc3a88476b8e0366dbd40493ad4bc9
>>>>>>> 3f080e7... slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in
filename = slapos.cfg.in
download-only = true
download-only = true
...
...
software/slaprunner/instance-runner.cfg
View file @
e69b012f
...
@@ -490,6 +490,7 @@ context =
...
@@ -490,6 +490,7 @@ context =
key instance_monitoring_url slaprunner:instance-monitor-url
key instance_monitoring_url slaprunner:instance-monitor-url
key ipv4 slaprunner:ipv4
key ipv4 slaprunner:ipv4
key ipv6 slaprunner:ipv6
key ipv6 slaprunner:ipv6
raw knowledge0_file $${buildout:directory}/$${private:filename}
key log_dir slaprunner:log_dir
key log_dir slaprunner:log_dir
key partition_amount slaprunner:partition-amount
key partition_amount slaprunner:partition-amount
key private_key slaprunner:private_key
key private_key slaprunner:private_key
...
...
software/slaprunner/template/slapos.cfg.in
View file @
e69b012f
...
@@ -29,6 +29,7 @@ debug = {{ debug }}
...
@@ -29,6 +29,7 @@ debug = {{ debug }}
auto_deploy = {{ auto_deploy }}
auto_deploy = {{ auto_deploy }}
auto_deploy_instance = {{ auto_deploy_instance }}
auto_deploy_instance = {{ auto_deploy_instance }}
autorun = {{ autorun }}
autorun = {{ autorun }}
knowledge0_cfg = {{ knowledge0_file }}
[slapproxy]
[slapproxy]
host = {{ proxy_host }}
host = {{ proxy_host }}
...
...
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