Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx: split DAV_EXT from standard nginx DAV config

Browse source 
Split DAV_EXT from standard nginx DAV config as additional WebDAV
methods are provided by an external module.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-04-20 07:43:53 +02:00
parent e14a7073b6
commit 8b144f0dc3
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/nginx/Config_ssl.in
View file

@ -15,6 +15,14 @@ config NGINX_DAV
Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE. Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
default n default n
config NGINX_DAV_EXT
bool
prompt "Enable WebDAV EXT module"
select NGINX_DAV
help
Enable the WebDAV methods PROPFIND, OPTIONS, LOCK, UNLOCK.
default n
config NGINX_UBUS config NGINX_UBUS
bool bool
prompt "Enable UBUS module" prompt "Enable UBUS module"

11
net/nginx/Makefile
View file

@ -27,6 +27,7 @@ PKG_BUILD_FLAGS:=gc-sections
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \
CONFIG_NGINX_DAV \ CONFIG_NGINX_DAV \
CONFIG_NGINX_DAV_EXT \
CONFIG_NGINX_FLV \ CONFIG_NGINX_FLV \
CONFIG_NGINX_UBUS \ CONFIG_NGINX_UBUS \
CONFIG_NGINX_STUB_STATUS \ CONFIG_NGINX_STUB_STATUS \
@ -248,7 +249,10 @@ ifneq ($(BUILD_VARIANT),all-module)
ADDITIONAL_MODULES += --with-http_flv_module ADDITIONAL_MODULES += --with-http_flv_module
endif endif
ifeq ($(CONFIG_NGINX_DAV),y) ifeq ($(CONFIG_NGINX_DAV),y)
ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module ADDITIONAL_MODULES += --with-http_dav_module
endif
ifeq ($(CONFIG_NGINX_DAV_EXT),y)
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
endif endif
ifeq ($(CONFIG_NGINX_UBUS),y) ifeq ($(CONFIG_NGINX_UBUS),y)
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
@ -297,6 +301,7 @@ else
CONFIG_NGINX_NAXSI:=y CONFIG_NGINX_NAXSI:=y
CONFIG_NGINX_LUA:=y CONFIG_NGINX_LUA:=y
CONFIG_NGINX_DAV:=y CONFIG_NGINX_DAV:=y
CONFIG_NGINX_DAV_EXT:=y
CONFIG_NGINX_UBUS:=y CONFIG_NGINX_UBUS:=y
ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \ ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \
--with-http_dav_module \ --with-http_dav_module \
@ -508,7 +513,7 @@ endef
define Build/Patch define Build/Patch
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" "" ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
endif endif
ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" "" ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
@ -562,7 +567,7 @@ ifeq ($(CONFIG_NGINX_TS_MODULE),y)
$(Prepare/nginx-ts) $(Prepare/nginx-ts)
endif endif
ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" "" ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
$(eval $(call Download,nginx-dav-ext-module)) $(eval $(call Download,nginx-dav-ext-module))
$(Prepare/nginx-dav-ext-module) $(Prepare/nginx-dav-ext-module)
endif endif