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

Merge pull request #14 from markwilde/master

Browse Source 
Added additional nginx_conf_path for Debian.
pull/16/head
Jeff Geerling 9 years ago
parent 0d504441c6 3e8df12f7a
commit 6eff7fa665
2 changed files with 6 additions and 0 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. 5
      templates/nginx.conf.j2
  2. 1
      vars/Debian.yml

5
templates/nginx.conf.j2
Unescape View File

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

1
vars/Debian.yml
Unescape View File

@ -1,4 +1,5 @@
---
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"