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

Added additional nginx_conf_path for Debian 

For Debian systems both conf.d and sites-enabled should be included by default. Redhat systems have not been changed.

Issues came up using Kibana on Ubuntu as it installs kibana.conf in the conf.d folder.
This commit is contained in:
Mark Wilde 2015-04-29 12:58:08 +01:00
parent 14765e52bf
commit c02bf089a4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/nginx.conf.j2
View File

@ -47,5 +47,10 @@ http {
}
{% endfor %}
include {{ nginx_vhost_path }}/*;
{% if nginx_conf_path is defined %}
include {{ nginx_conf_path }};
{% endif %}
{% if nginx_vhost_path is defined %}
include {{ nginx_vhost_path }};
{% endif %}
}

3
vars/Debian.yml
View File

@ -1,4 +1,5 @@
---
nginx_vhost_path: /etc/nginx/sites-enabled
nginx_conf_path: /etc/nginx/conf.d/*.conf
nginx_vhost_path: /etc/nginx/sites-enabled/*
nginx_default_vhost_path: /etc/nginx/sites-enabled/default
__nginx_user: "www-data"

2
vars/RedHat.yml
View File

@ -1,4 +1,4 @@
---
nginx_vhost_path: /etc/nginx/conf.d
nginx_vhost_path: /etc/nginx/conf.d/*
nginx_default_vhost_path: /etc/nginx/conf.d/default.conf
__nginx_user: "nginx"