Upstream
/
ansible-role-nginx
mirror of https://github.com/geerlingguy/ansible-role-nginx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from Firfi/master 

Restore compartability with geerlingguy-kibana, only include .conf files.
This commit is contained in:
Jeff Geerling 2015-05-16 06:50:44 -07:00
parent 0ae5084e53 d209cbe89a
commit c892b0a2fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/nginx.conf.j2
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 %}
}