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
Jean-Paul Smets
slapos
Commits
d2a5902d
Commit
d2a5902d
authored
Jul 08, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cdn-me: Remove additional / when request frontend
parent
ff5842c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/cdn-me/instance-cdn-request.cfg.jinja2
software/cdn-me/instance-cdn-request.cfg.jinja2
+2
-2
software/cdn-me/software.cfg
software/cdn-me/software.cfg
+1
-1
No files found.
software/cdn-me/instance-cdn-request.cfg.jinja2
View file @
d2a5902d
...
@@ -29,11 +29,11 @@ software-type = custom-personal
...
@@ -29,11 +29,11 @@ software-type = custom-personal
slave = true
slave = true
{% if slapparameter_dict.get('port', '80') != '443' %}
{% if slapparameter_dict.get('port', '80') != '443' %}
config-url = http://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}
/
config-url = http://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}
{% endif -%}
{% endif -%}
{% if slapparameter_dict.get('port', '80') == '443' %}
{% if slapparameter_dict.get('port', '80') == '443' %}
config-url = https://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '443') }}
/
config-url = https://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '443') }}
{% endif -%}
{% endif -%}
{% if slapparameter_dict.get('frontend-custom_domain', '') %}
{% if slapparameter_dict.get('frontend-custom_domain', '') %}
...
...
software/cdn-me/software.cfg
View file @
d2a5902d
...
@@ -21,7 +21,7 @@ mode = 0644
...
@@ -21,7 +21,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-cdn-request.cfg.jinja2
url = ${:_profile_base_location_}/instance-cdn-request.cfg.jinja2
output = ${buildout:directory}/template-cdn-request.cfg.jinja2
output = ${buildout:directory}/template-cdn-request.cfg.jinja2
md5sum =
11c1bb2dca674d2efe41f8cb0389ec4c
md5sum =
a5ee428ec915a9e638b46ce3f4dd42f3
mode = 0644
mode = 0644
[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