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

nginx: add required modules for Openresty lua module

Browse source 
Add nginx-mod-lua-resty-core and nginx-mod-lua-resty-lrucache new module
required for the lua module to correctly works.

The module are based on luajit2 from Openresty.

Signed-off-by: Javier Marcet <javier@marcet.info>
[ improve commit description/tile and fix redundant dependency ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Javier Marcet 2023-06-30 13:28:53 +02:00 committed by Christian Marangi
parent 382a089d08
commit 266be55d55
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
net/nginx/Makefile
View file

@ -29,6 +29,8 @@ PKG_BUILD_FLAGS:=gc-sections
PKG_MOD_EXTRA := \ PKG_MOD_EXTRA := \
geoip2 \ geoip2 \
lua \ lua \
lua-resty-core \
lua-resty-lrucache \
rtmp \ rtmp \
dav-ext \ dav-ext \
naxsi \ naxsi \
@ -206,6 +208,33 @@ define Download/nginx-mod-geoip2
PROTO:=git PROTO:=git
endef endef
define Package/nginx-mod-lua-resty-lrucache
$(call Package/nginx/default)
DEPENDS:=+luajit2
TITLE:=Nginx Lua OpenResty lrucache module
endef
define Package/nginx-mod-lua-resty-core
$(call Package/nginx/default)
DEPENDS:=+nginx-mod-lua-resty-lrucache
TITLE:=Nginx Lua OpenResty core module
endef
define Package/nginx-mod-lua-resty-lrucache/install
$(INSTALL_DIR) $(1)/usr/lib/lua/resty/lrucache
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-lrucache/lib/resty/*.lua $(1)/usr/lib/lua/resty
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-lrucache/lib/resty/lrucache/*.lua $(1)/usr/lib/lua/resty/lrucache
endef
define Package/nginx-mod-lua-resty-core/install
$(INSTALL_DIR) $(1)/usr/lib/lua/ngx/ssl
$(INSTALL_DIR) $(1)/usr/lib/lua/resty/core
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-core/lib/ngx/*.lua $(1)/usr/lib/lua/ngx
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-core/lib/ngx/ssl/*.lua $(1)/usr/lib/lua/ngx/ssl
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-core/lib/resty/*.lua $(1)/usr/lib/lua/resty
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-mod-lua-resty-core/lib/resty/core/*.lua $(1)/usr/lib/lua/resty/core
endef
define Download/nginx-mod-headers-more define Download/nginx-mod-headers-more
VERSION:=bea1be3bbf6af28f6aa8cf0c01c07ee1637e2bd0 VERSION:=bea1be3bbf6af28f6aa8cf0c01c07ee1637e2bd0
URL:=https://github.com/openresty/headers-more-nginx-module.git URL:=https://github.com/openresty/headers-more-nginx-module.git
@ -249,6 +278,20 @@ define Download/nginx-mod-lua
PROTO:=git PROTO:=git
endef endef
define Download/nginx-mod-lua-resty-core
VERSION:=698d7de385c7d58d00f4853b6a9ab2ab10243ca5
URL:=https://github.com/openresty/lua-resty-core.git
MIRROR_HASH:=366f24e1ba6221e34f6ba20ab29146438438f88c89fd71f9500d169b3f5aedf0
PROTO:=git
endef
define Download/nginx-mod-lua-resty-lrucache
VERSION:=a79615ec9dc547fdb4aaee59ef8f5a50648ce9fd
URL:=https://github.com/openresty/lua-resty-lrucache.git
MIRROR_HASH:=7122a7f5f00fa0a1bb8e84f82fe1cc4ad7c368093508a8c04948b1c8d770a88f
PROTO:=git
endef
define Download/nginx-mod-dav-ext define Download/nginx-mod-dav-ext
VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
URL:=https://github.com/arut/nginx-dav-ext-module.git URL:=https://github.com/arut/nginx-dav-ext-module.git
@ -408,16 +451,18 @@ CONFIGURE_ARGS += \
$(if $(call IsEnabled,NGINX_HTTP_SUB),--with-http_sub_module) \ $(if $(call IsEnabled,NGINX_HTTP_SUB),--with-http_sub_module) \
$(if $(CONFIG_PACKAGE_nginx-mod-stream),--with-stream=dynamic --with-stream_ssl_module --with-stream_ssl_preread_module) \ $(if $(CONFIG_PACKAGE_nginx-mod-stream),--with-stream=dynamic --with-stream_ssl_module --with-stream_ssl_preread_module) \
$(if $(CONFIG_PACKAGE_nginx-mod-naxsi),--add-dynamic-module=$(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_src) \ $(if $(CONFIG_PACKAGE_nginx-mod-naxsi),--add-dynamic-module=$(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_src) \
$(foreach m,$(filter-out naxsi,$(PKG_MOD_EXTRA)), \ $(foreach m,$(filter-out lua-resty-core lua-resty-lrucache naxsi,$(PKG_MOD_EXTRA)), \
$(if $(CONFIG_PACKAGE_nginx-mod-$(m)),--add-dynamic-module=$(PKG_BUILD_DIR)/nginx-mod-$(m))) $(if $(CONFIG_PACKAGE_nginx-mod-$(m)),--add-dynamic-module=$(PKG_BUILD_DIR)/nginx-mod-$(m)))
$(eval $(call BuildPackage,nginx-ssl)) $(eval $(call BuildPackage,nginx-ssl))
$(eval $(call BuildPackage,nginx-full)) $(eval $(call BuildPackage,nginx-full))
$(eval $(call BuildPackage,nginx-mod-luci)) $(eval $(call BuildPackage,nginx-mod-luci))
$(eval $(call BuildPackage,nginx-mod-lua-resty-lrucache))
$(eval $(call BuildPackage,nginx-mod-lua-resty-core))
$(eval $(call BuildModule,stream,+@NGINX_STREAM_CORE_MODULE, \ $(eval $(call BuildModule,stream,+@NGINX_STREAM_CORE_MODULE, \
ngx_stream, Add support for NGINX request streaming.)) ngx_stream, Add support for NGINX request streaming.))
$(eval $(call BuildModule,lua,+luajit,ngx_http_lua, \ $(eval $(call BuildModule,lua,+nginx-mod-lua-resty-core,ngx_http_lua, \
Enable Lua module)) Enable Lua module (luajit2 based, OpenResty patches)))
$(eval $(call BuildModule,ubus,+libubus +libjson-c +libblobmsg-json +@NGINX_UBUS, \ $(eval $(call BuildModule,ubus,+libubus +libjson-c +libblobmsg-json +@NGINX_UBUS, \
ngx_http_ubus,Enable UBUS api support directly from the server.)) ngx_http_ubus,Enable UBUS api support directly from the server.))
$(eval $(call BuildModule,dav-ext,+@NGINX_DAV +libxml2,ngx_http_dav_ext, \ $(eval $(call BuildModule,dav-ext,+@NGINX_DAV +libxml2,ngx_http_dav_ext, \