diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/nginx/Config.in | 7 | ||||
| -rw-r--r-- | net/nginx/Config_ssl.in | 7 | ||||
| -rw-r--r-- | net/nginx/Makefile | 63 | ||||
| -rw-r--r-- | net/nginx/files-luci-support/60_nginx-luci-support | 13 |
4 files changed, 71 insertions, 19 deletions
diff --git a/net/nginx/Config.in b/net/nginx/Config.in index 55c24ea7a..ccb5e240f 100644 --- a/net/nginx/Config.in +++ b/net/nginx/Config.in @@ -22,6 +22,13 @@ config NGINX_DAV Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE. default n +config NGINX_UBUS + bool + prompt "Enable UBUS module" + help + Enable UBUS api support directly from the server. + default y + config NGINX_FLV bool prompt "Enable FLV module" diff --git a/net/nginx/Config_ssl.in b/net/nginx/Config_ssl.in index f889cc3ec..050d71fe3 100644 --- a/net/nginx/Config_ssl.in +++ b/net/nginx/Config_ssl.in @@ -15,6 +15,13 @@ config NGINX_DAV Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE. default n +config NGINX_UBUS + bool + prompt "Enable UBUS module" + help + Enable UBUS api support directly from the server. + default y + config NGINX_FLV bool prompt "Enable FLV module" diff --git a/net/nginx/Makefile b/net/nginx/Makefile index 9a940580b..b04f9171e 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx PKG_VERSION:=1.16.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nginx.org/download/ @@ -28,6 +28,7 @@ PKG_CONFIG_DEPENDS := \ CONFIG_NGINX_SSL \ CONFIG_NGINX_DAV \ CONFIG_NGINX_FLV \ + CONFIG_NGINX_UBUS \ CONFIG_NGINX_STUB_STATUS \ CONFIG_NGINX_HTTP_CHARSET \ CONFIG_NGINX_HTTP_GZIP \ @@ -82,7 +83,8 @@ define Package/nginx/default TITLE:=Nginx web server URL:=http://nginx.org/ DEPENDS:=+NGINX_PCRE:libpcre +NGINX_SSL:libopenssl \ - +NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +libpthread +NGINX_DAV:libxml2 + +NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +libpthread +NGINX_DAV:libxml2 \ + +NGINX_UBUS:libubus +NGINX_UBUS:libblobmsg-json +NGINX_UBUS:libjson-c endef define Package/nginx/description @@ -111,7 +113,8 @@ Package/nginx-ssl/description = $(Package/nginx/description) \ define Package/nginx-all-module $(Package/nginx/default) TITLE += with ALL module selected - DEPENDS:=+libpcre +libopenssl +zlib +liblua +libpthread +libxml2 + DEPENDS:=+libpcre +libopenssl +zlib +liblua +libpthread +libxml2 \ + +libubus +libblobmsg-json +libjson-c VARIANT:=all-module PROVIDES:=nginx endef @@ -255,6 +258,9 @@ ifneq ($(BUILD_VARIANT),all-module) ifeq ($(CONFIG_NGINX_DAV),y) ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module endif + ifeq ($(CONFIG_NGINX_UBUS),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module + endif ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y) ADDITIONAL_MODULES += --with-http_auth_request_module endif @@ -299,6 +305,7 @@ else CONFIG_NGINX_NAXSI:=y CONFIG_NGINX_LUA:=y CONFIG_NGINX_DAV:=y + CONFIG_NGINX_UBUS:=y ADDITIONAL_MODULES += --with-http_ssl_module --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src \ --add-module=$(PKG_BUILD_DIR)/lua-nginx --with-ipv6 --with-http_stub_status_module --with-http_flv_module \ --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module \ @@ -306,7 +313,7 @@ else --with-http_secure_link_module --with-http_sub_module --add-module=$(PKG_BUILD_DIR)/nginx-headers-more \ --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module \ --add-module=$(PKG_BUILD_DIR)/nginx-brotli --add-module=$(PKG_BUILD_DIR)/nginx-rtmp \ - --add-module=$(PKG_BUILD_DIR)/nginx-ts + --add-module=$(PKG_BUILD_DIR)/nginx-ts --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module config_files += koi-utf koi-win win-utf fastcgi_params endif @@ -407,6 +414,7 @@ define Build/Prepare $(Prepare/nginx-rtmp) $(Prepare/nginx-ts) $(Prepare/nginx-dav-ext-module) + $(Prepare/nginx-ubus-module) endef @@ -414,16 +422,16 @@ ifeq ($(CONFIG_NGINX_HEADERS_MORE),y) define Download/nginx-headers-more VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d SUBDIR:=nginx-headers-more - FILE:=headers-more-nginx-module-$$(VERSION).tar.gz + FILE:=headers-more-nginx-module-$$(VERSION).tar.xz URL:=https://github.com/openresty/headers-more-nginx-module.git - MIRROR_HASH:=432609015719aaa7241e5166c7cda427acbe004f725887f78ef629d51bd9cb3f + MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd PROTO:=git endef $(eval $(call Download,nginx-headers-more)) define Prepare/nginx-headers-more $(eval $(Download/nginx-headers-more)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef endif @@ -450,16 +458,16 @@ ifeq ($(CONFIG_NGINX_RTMP_MODULE),y) define Download/nginx-rtmp VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf SUBDIR:=nginx-rtmp - FILE:=ngx-rtmp-module-$$(VERSION).tar.gz + FILE:=ngx-rtmp-module-$$(VERSION).tar.xz URL:=https://github.com/ut0mt8/nginx-rtmp-module.git - MIRROR_HASH:=9ba7625718d21f658c4878729271832a07bd989165f1d1c720b3a9b54cf738cc + MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1 PROTO:=git endef $(eval $(call Download,nginx-rtmp)) define Prepare/nginx-rtmp $(eval $(Download/nginx-rtmp)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef endif @@ -468,16 +476,16 @@ ifeq ($(CONFIG_NGINX_TS_MODULE),y) define Download/nginx-ts VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd SUBDIR:=nginx-ts - FILE:=ngx-ts-module-$$(VERSION).tar.gz + FILE:=ngx-ts-module-$$(VERSION).tar.xz URL:=https://github.com/arut/nginx-ts-module.git - MIRROR_HASH:=31ecc9968b928886b54884138eafe2fa747648bca5094d4c3132e8ae9509d1d3 + MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18 PROTO:=git endef $(eval $(call Download,nginx-ts)) define Prepare/nginx-ts $(eval $(Download/nginx-ts)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef endif @@ -486,16 +494,16 @@ ifeq ($(CONFIG_NGINX_NAXSI),y) define Download/nginx-naxsi VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002 SUBDIR:=nginx-naxsi - FILE:=nginx-naxsi-module-$$(VERSION).tar.gz + FILE:=nginx-naxsi-module-$$(VERSION).tar.xz URL:=https://github.com/nbs-system/naxsi.git - MIRROR_HASH:=7ab791f2ff38096f48013141bbfe20ba213d5e04dcac08ca82e0cac07d5c30f0 + MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535 PROTO:=git endef $(eval $(call Download,nginx-naxsi)) define Prepare/nginx-naxsi $(eval $(Download/nginx-naxsi)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef endif @@ -504,16 +512,16 @@ ifeq ($(CONFIG_NGINX_LUA),y) define Download/lua-nginx VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0 SUBDIR:=lua-nginx - FILE:=lua-nginx-module-$$(VERSION).tar.gz + FILE:=lua-nginx-module-$$(VERSION).tar.xz URL:=https://github.com/openresty/lua-nginx-module.git - MIRROR_HASH:=ae439f9a8b3c34d7240735b844db72ee721af4791bbaff5692bca20e6785f541 + MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395 PROTO:=git endef $(eval $(call Download,lua-nginx)) define Prepare/lua-nginx $(eval $(Download/lua-nginx)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) $(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx) endef endif @@ -537,6 +545,23 @@ ifeq ($(CONFIG_NGINX_DAV),y) endef endif +ifeq ($(CONFIG_NGINX_UBUS),y) + define Download/nginx-ubus-module + VERSION:=306703d25c8ac9f49df86d20c274cae2a7569945 + SUBDIR:=nginx-ubus-module + FILE:=nginx-ubus-module-$$(VERSION).tar.gz + URL:=https://github.com/Ansuel/nginx-ubus-module.git + MIRROR_HASH:=7513940596c13e903819d1427698c69120d6cd03e91179f3d165f616db7d57e2 + PROTO:=git + endef + $(eval $(call Download,nginx-ubus-module)) + + define Prepare/nginx-ubus-module + $(eval $(Download/nginx-ubus-module)) + gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + endef +endif + $(eval $(call BuildPackage,nginx)) $(eval $(call BuildPackage,nginx-ssl)) $(eval $(call BuildPackage,nginx-all-module)) diff --git a/net/nginx/files-luci-support/60_nginx-luci-support b/net/nginx/files-luci-support/60_nginx-luci-support index dd076d260..b682a832e 100644 --- a/net/nginx/files-luci-support/60_nginx-luci-support +++ b/net/nginx/files-luci-support/60_nginx-luci-support @@ -25,4 +25,17 @@ if [ -f "/etc/nginx/luci_nginx.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then fi fi +if nginx -V 2>&1 | grep -q ubus; then + if [ -z "$(cat /etc/nginx/luci_uwsgi.conf | grep ubus)" ]; then + cat <<EOT >> /etc/nginx/luci_uwsgi.conf + +location /ubus { + ubus_interpreter; + ubus_socket_path /var/run/ubus.sock; + ubus_parallel_req 2; +} +EOT + fi +fi + exit 0 |