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

PR #14: Change use of nginx_conf_path and nginx_vhost_path to match naming convention.

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

6
templates/nginx.conf.j2
Unescape View File

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

2
vars/Debian.yml
Unescape View File

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

1
vars/RedHat.yml
Unescape View File

@ -1,4 +1,5 @@
--- ---
nginx_conf_path: /etc/nginx/conf.d
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_default_vhost_path: /etc/nginx/conf.d/default.conf
__nginx_user: "nginx" __nginx_user: "nginx"