nginx: unified indentation character and add additional config entry

The original configure file mixed tab and space
characters as indentation, so use 4 spaces as the
default indentation character.

Add /etc/nginx/conf.d/*.conf as nginx additional configure
files. Then we can add individual conf file for other http
applications without modify the main nginx configure file.

Signed-off-by: James Qian <sotux82@gmail.com>
This commit is contained in:
James Qian 2018-11-20 18:28:16 +08:00
parent 7ec4304904
commit 9803e34512
4 changed files with 62 additions and 58 deletions

View file

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

View file

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

View file

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