浏览代码

Merge pull request #14 from markwilde/master

Added additional nginx_conf_path for Debian.
Jeff Geerling 10 年之前
父节点
当前提交
6eff7fa665
共有 2 个文件被更改,包括 6 次插入0 次删除
  1. 5 0
      templates/nginx.conf.j2
  2. 1 0
      vars/Debian.yml

+ 5 - 0
templates/nginx.conf.j2

@@ -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 - 0
vars/Debian.yml

@@ -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"