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
0655bd69
Commit
0655bd69
authored
May 26, 2015
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use product. based software release url and fix connection parameter.
parent
3811ff45
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
software/cdn-me/instance-cdn-request.cfg
software/cdn-me/instance-cdn-request.cfg
+3
-4
software/cdn-me/software.cfg
software/cdn-me/software.cfg
+4
-1
No files found.
software/cdn-me/instance-cdn-request.cfg
View file @
0655bd69
...
@@ -22,9 +22,9 @@ tmp = $${:home}/tmp/
...
@@ -22,9 +22,9 @@ tmp = $${:home}/tmp/
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = WebSite Frontend
name = WebSite 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 =
product.frontend
slave = true
slave = true
config-url = http://$${request-re6stnet-token-slave:ipv6}/
config-url = http://$${request-re6stnet-token-slave:
connection-
ipv6}/
config-domain = $${slap-parameter:frontend-domain}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
return = site_url domain
...
@@ -33,11 +33,10 @@ return = site_url domain
...
@@ -33,11 +33,10 @@ return = site_url domain
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Re6st token Frontend
name = Re6st token 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 =
product.re6st
slave = true
slave = true
return = token ipv6
return = token ipv6
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url = https://$${request-frontend-token-slave:connection-domain}
url = https://$${request-frontend-token-slave:connection-domain}
...
...
software/cdn-me/software.cfg
View file @
0655bd69
...
@@ -22,9 +22,12 @@ mode = 0644
...
@@ -22,9 +22,12 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-cdn-request.cfg
url = ${:_profile_base_location_}/instance-cdn-request.cfg
output = ${buildout:directory}/template-cdn-request.cfg
output = ${buildout:directory}/template-cdn-request.cfg
md5sum =
2c8f8ca9d728b8b2c52e437b30b8dc3a
md5sum =
f4e101321f3d24321afc2130512bda9e
mode = 0644
mode = 0644
[slapos.cookbook-repository]
branch = request.product
[eggs]
[eggs]
recipe = z3c.recipe.scripts
recipe = z3c.recipe.scripts
eggs =
eggs =
...
...
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