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
5705021b
Commit
5705021b
authored
Jan 14, 2015
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: change clone ports.
Also remove unused variable in nginx-conf.
parent
6ae343bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+3
-3
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+8
-0
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+0
-1
No files found.
software/slaprunner/common.cfg
View file @
5705021b
...
@@ -45,7 +45,7 @@ mode = 0644
...
@@ -45,7 +45,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 =
a9977e1c7eed82ab3c2d405f7a3adfad
md5sum =
27b20fe461b177f5ee53570f643cf0b7
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -60,7 +60,7 @@ mode = 0644
...
@@ -60,7 +60,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-import.cfg.in
url = ${:_profile_base_location_}/instance-runner-import.cfg.in
output = ${buildout:directory}/instance-runner-import.cfg
output = ${buildout:directory}/instance-runner-import.cfg
md5sum =
b1ab64f54a44e998e8e8fecb565812cd
md5sum =
1e504da0fd4ce7f5130df9c5166dcc7c
mode = 0644
mode = 0644
[template-runner-export-script]
[template-runner-export-script]
...
@@ -75,7 +75,7 @@ mode = 0644
...
@@ -75,7 +75,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-export.cfg.in
url = ${:_profile_base_location_}/instance-runner-export.cfg.in
output = ${buildout:directory}/instance-runner-export.cfg
output = ${buildout:directory}/instance-runner-export.cfg
md5sum =
49bc44385c9da2fac0cdd559713368d5
md5sum =
2df7ed6a6dc1250b317ef1a4d1376e2b
mode = 0644
mode = 0644
[template-resilient]
[template-resilient]
...
...
software/slaprunner/instance-runner-import.cfg.in
View file @
5705021b
...
@@ -53,6 +53,14 @@ parts +=
...
@@ -53,6 +53,14 @@ parts +=
## Monitor for import runner
## Monitor for import runner
monitor-latest-restored-backup
monitor-latest-restored-backup
# For the needs of importer, we run the full slaprunner
# In case both exporter and importer (aka main instance and clone instance)
# run with the same IP (usually for testing purposes),
# run slaprunner using different ports.
[slaprunner]
proxy_port = 50000
runner_port = 50005
[importer]
[importer]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${template-runner-import-script:location}/${template-runner-import-script:filename}
template = ${template-runner-import-script:location}/${template-runner-import-script:filename}
...
...
software/slaprunner/instance-runner.cfg
View file @
5705021b
...
@@ -265,7 +265,6 @@ scgi_temp_path = $${directory:tmp}/scgi_temp_path
...
@@ -265,7 +265,6 @@ scgi_temp_path = $${directory:tmp}/scgi_temp_path
nb_workers = 2
nb_workers = 2
# Network
# Network
local-ip = $${slap-network-information:local-ipv4}
local-ip = $${slap-network-information:local-ipv4}
port = 30001
global-ip = $${slap-network-information:global-ipv6}
global-ip = $${slap-network-information:global-ipv6}
global-port = $${slaprunner:runner_port}
global-port = $${slaprunner:runner_port}
# Backend
# Backend
...
...
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