infra/ansible-role-nginx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

no longer enabling ssl on nossl ports...

Browse source
This commit is contained in:
nd 2019-03-30 13:42:51 +01:00
parent 2d8e15d369
commit 6d75684a40
No known key found for this signature in database
GPG key ID: 21B5CD4DEE3670E9
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
templates/vhost.j2
View file

@ -1,3 +1,4 @@
#jinja2:lstrip_blocks: True
{% set vhost = item.value %} {% set vhost = item.value %}
{% set vhost_name = item.key %} {% set vhost_name = item.key %}
{% set vhost_listen = vhost.listen|default({}) %} {% set vhost_listen = vhost.listen|default({}) %}
@ -12,8 +13,8 @@ server {
listen [::]:{{ vhost_listen.ssl_port|default(443) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; listen [::]:{{ vhost_listen.ssl_port|default(443) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %};
{% endif %} {% endif %}
{% if vhost_listen.nossl|default(False) %} {% if vhost_listen.nossl|default(False) %}
listen {{ vhost_listen.nossl_port|default(80) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; listen {{ vhost_listen.nossl_port|default(80) }} {% if vhost.default_server|default(False) %}default_server{% endif %};
listen [::]:{{ vhost_listen.nossl_port|default(80) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; listen [::]:{{ vhost_listen.nossl_port|default(80) }} {% if vhost.default_server|default(False) %}default_server{% endif %};
{% endif %} {% endif %}
{% for header in vhost.add_headers|default([]) %} {% for header in vhost.add_headers|default([]) %}