浏览代码

Merge pull request #16 from Firfi/master

Restore compartability with geerlingguy-kibana, only include .conf files.
Jeff Geerling 10 年之前
父节点
当前提交
c892b0a2fe
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      templates/nginx.conf.j2

+ 2 - 2
templates/nginx.conf.j2

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