Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
uib-ub
Drift
roller-ansible
apache
Commits
d7727f3f
Commit
d7727f3f
authored
Jun 15, 2021
by
Oyvind.Gjesdal
Browse files
include using default config values on http if force_ssl flag is set and is false
parent
e58689a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
templates/vhosts.conf.j2
View file @
d7727f3f
...
...
@@ -16,7 +16,7 @@
{% if vhost.serveradmin is defined %}
ServerAdmin {{ vhost.serveradmin }}
{% endif %}
{%if vhost.ssl is undefined or not vhost.ssl | bool %}
{%if
(
vhost.ssl is undefined or not vhost.ssl | bool
) or (vhost.force_ssl is defined and vhost.force_ssl == false)
%}
{% if vhost.documentroot is defined %}
<Directory "{{ vhost.documentroot }}">
AllowOverride {{ vhost.allow_override | default(apache_allow_override) }}
...
...
@@ -48,9 +48,6 @@ Redirect Permanent / https://{{ vhost.servername }}/
{% endif %}
{% if vhost.extra_parameters is defined and vhost.force_ssl is defined and vhost.force_ssl == false %}
{{ vhost.extra_parameters }}
{% endif %}
</VirtualHost>
{% endfor %}
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