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
Tatuya Kamada
slapos
Commits
1404806c
Commit
1404806c
authored
Aug 30, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Slaprunner SR: allow to specify custom domain for frontends.
parent
6ae98bfe
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+9
-4
No files found.
software/slaprunner/common.cfg
View file @
1404806c
...
@@ -80,7 +80,7 @@ mode = 0644
...
@@ -80,7 +80,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
output = ${buildout:directory}/template-runner.cfg
md5sum =
4877c808972b6b04bfac1de94c14a301
md5sum =
bcd1ee4dd126d2c6e9461f7753fc83b7
mode = 0644
mode = 0644
[instance-runner-import]
[instance-runner-import]
...
...
software/slaprunner/instance-runner.cfg
View file @
1404806c
...
@@ -300,8 +300,9 @@ name = SlapRunner Frontend
...
@@ -300,8 +300,9 @@ name = SlapRunner Frontend
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
slave = true
config = url
config = url domain
config-url = $${slaprunner:access-url}
config-url = $${node-frontend:access-url}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
return = site_url domain
[request-cloud9-frontend]
[request-cloud9-frontend]
...
@@ -310,8 +311,9 @@ recipe = slapos.cookbook:requestoptional
...
@@ -310,8 +311,9 @@ recipe = slapos.cookbook:requestoptional
name = Cloud9 Frontend
name = Cloud9 Frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
slave = true
config = url
config = url
domain
config-url = $${node-frontend:access-url}
config-url = $${node-frontend:access-url}
config-domain = $${slap-parameter:cloud9-frontend-domain}
return = site_url domain
return = site_url domain
#--------------------------------------
#--------------------------------------
...
@@ -389,3 +391,6 @@ authorized-key =
...
@@ -389,3 +391,6 @@ authorized-key =
# Default value of instances number in slaprunner
# Default value of instances number in slaprunner
instance-amount = 10
instance-amount = 10
debug = false
debug = false
cloud9-frontend-domain =
frontend-domain =
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