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

Merge pull request #16 from Firfi/master

Browse Source 
Restore compartability with geerlingguy-kibana, only include .conf files.
pull/18/head 1.3.1
Jeff Geerling 9 years ago
parent 0ae5084e53 d209cbe89a
commit c892b0a2fe
1 changed files with 2 additions and 2 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. 4
      templates/nginx.conf.j2

4
templates/nginx.conf.j2
Unescape View File

@ -47,8 +47,8 @@ http {
}
{% endfor %}
include {{ nginx_conf_path }}/*;
include {{ nginx_conf_path }}/*.conf;
{% if nginx_conf_path != nginx_vhost_path %}
include {{ nginx_vhost_path }}/*;
include {{ nginx_vhost_path }}/*.conf;
{% endif %}
}