diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index 2f40470..cace955 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -51,6 +51,6 @@ http { include {{ nginx_conf_path }}; {% endif %} {% if nginx_vhost_path is defined %} - include {{ nginx_vhost_path }}; + include {{ nginx_vhost_path }}/*; {% endif %} } diff --git a/vars/Debian.yml b/vars/Debian.yml index 77881d1..d84af98 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,5 +1,5 @@ --- nginx_conf_path: /etc/nginx/conf.d/*.conf -nginx_vhost_path: /etc/nginx/sites-enabled/* +nginx_vhost_path: /etc/nginx/sites-enabled nginx_default_vhost_path: /etc/nginx/sites-enabled/default __nginx_user: "www-data" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index e727d4c..2412304 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -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"