peter.babic
/
ansible-role-nginx
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR #86 follow-up: Fix a couple code style issues.

Browse Source
pull/213/merge 3.0.0
Jeff Geerling 3 years ago
parent e533fbab36
commit 1820e90b4c
2 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      README.md
  2. 4
      templates/vhost.j2

2
README.md
Unescape View File

@ -19,7 +19,7 @@ Available variables are listed below, along with default values (see `defaults/m
nginx_listen_ipv6: true nginx_listen_ipv6: true
Whether or not we want to listen on IPv6, this is enabled by default. Whether or not to listen on IPv6 (applied to all vhosts managed by this role).
nginx_vhosts: [] nginx_vhosts: []

4
templates/vhost.j2
Unescape View File

@ -2,9 +2,9 @@
{% if item.server_name_redirect is defined %} {% if item.server_name_redirect is defined %}
server { server {
listen {{ item.listen | default('80') }}; listen {{ item.listen | default('80') }};
{% if nginx_listen_ipv6 %} {% if nginx_listen_ipv6 %}
listen [::]:{{item.listen | default('80') }}; listen [::]:{{item.listen | default('80') }};
{% endif %} {% endif %}
server_name {{ item.server_name_redirect }}; server_name {{ item.server_name_redirect }};
return 301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri; return 301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri;
} }