Merge pull request #7482 from sotux/master

nginx: unified indentation character and add additional configure directory

net/nginx/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.15.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/

net/nginx/files-luci-support/luci_nginx.conf

@@ -46,4 +46,6 @@ http {
         include luci_uwsgi.conf;
 
     }
+
+    include /etc/nginx/conf.d/*.conf;
 }

net/nginx/files-luci-support/luci_nginx_ssl.conf

@@ -61,4 +61,6 @@ http {
         include luci_uwsgi.conf;
 
     }
+
+    include /etc/nginx/conf.d/*.conf;
 }