Slaprunner SR: allow to specify custom domain for frontends.

parent 6ae98bfe
...@@ -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]
......
...@@ -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 =
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment