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

templates/nginx.conf.j2

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

vars/Debian.yml

@@ -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_default_vhost_path: /etc/nginx/sites-enabled/default
 __nginx_user: "www-data"

vars/RedHat.yml

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