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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhifan huang
slapos
Commits
287685eb
Commit
287685eb
authored
Oct 19, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: Respect ServerAlias configuration on the cached slave
parent
ca6b5999
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/templates/cached-virtualhost.conf.in
...ware/apache-frontend/templates/cached-virtualhost.conf.in
+6
-0
No files found.
software/apache-frontend/common.cfg
View file @
287685eb
...
@@ -143,7 +143,7 @@ mode = 640
...
@@ -143,7 +143,7 @@ mode = 640
[template-cached-slave-virtualhost]
[template-cached-slave-virtualhost]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/cached-virtualhost.conf.in
url = ${:_profile_base_location_}/templates/cached-virtualhost.conf.in
md5sum =
b1fd5f2b94f026ccca5ff47167015f23
md5sum =
14c81d5a06bf2c4fd41f51b219197982
mode = 640
mode = 640
[template-log-access]
[template-log-access]
...
...
software/apache-frontend/templates/cached-virtualhost.conf.in
View file @
287685eb
...
@@ -2,6 +2,12 @@
...
@@ -2,6 +2,12 @@
# Only accept generic (i.e not Zope) backends on http
# Only accept generic (i.e not Zope) backends on http
<VirtualHost *:{{ cached_port }}>
<VirtualHost *:{{ cached_port }}>
ServerName {{ slave_parameter.get('custom_domain') }}
ServerName {{ slave_parameter.get('custom_domain') }}
{%- if 'server-alias' in slave_parameter -%}
{% set server_alias_list = slave_parameter.get('server-alias', '').split() %}
{%- for server_alias in server_alias_list %}
ServerAlias {{ server_alias }}
{% endfor %}
{%- endif %}
SSLProxyEngine on
SSLProxyEngine on
{% set ssl_proxy_verify = ('' ~ slave_parameter.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES -%}
{% set ssl_proxy_verify = ('' ~ slave_parameter.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES -%}
...
...
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