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
2a2f864b
Commit
2a2f864b
authored
Jul 06, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! remove needless / from rewrite rule.
parent
8732f703
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
slapos/recipe/apache_zope_backend/__init__.py
slapos/recipe/apache_zope_backend/__init__.py
+1
-2
slapos/recipe/apache_zope_backend/template/vhost.in
slapos/recipe/apache_zope_backend/template/vhost.in
+1
-1
No files found.
slapos/recipe/apache_zope_backend/__init__.py
View file @
2a2f864b
...
@@ -76,8 +76,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -76,8 +76,7 @@ class Recipe(GenericBaseRecipe):
'vhosts'
:
''
.
join
(
self
.
substituteTemplate
(
vhost_template_name
,
{
'vhosts'
:
''
.
join
(
self
.
substituteTemplate
(
vhost_template_name
,
{
'ip'
:
ip
,
'ip'
:
ip
,
'port'
:
port
,
'port'
:
port
,
'backend'
:
backend
,
'backend'
:
(
'%s/%s'
%
(
backend
.
rstrip
(
'/'
),
backend_path
.
strip
(
'/'
))).
rstrip
(
'/'
),
'backend-path'
:
backend_path
,
'ssl_enable'
:
ssl_enable
,
'ssl_enable'
:
ssl_enable
,
})
for
(
port
,
backend
)
in
backend_list
),
})
for
(
port
,
backend
)
in
backend_list
),
},
},
...
...
slapos/recipe/apache_zope_backend/template/vhost.in
View file @
2a2f864b
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
<VirtualHost *:%(port)s>
<VirtualHost *:%(port)s>
%(ssl_enable)s
%(ssl_enable)s
RewriteRule ^/(.*) %(backend)s
%(backend-path)s
/$1 [L,P]
RewriteRule ^/(.*) %(backend)s/$1 [L,P]
</VirtualHost>
</VirtualHost>
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