Add ngx_mruby

.gitmodules

@@ -161,3 +161,6 @@
 	path = nginx-tests
 	url = https://github.com/hnakamur/nginx-tests
 	branch = add_freenginx_proxy_cache_age
+[submodule "modules/ngx_mruby"]
+	path = modules/ngx_mruby
+	url = https://github.com/matsumotory/ngx_mruby

Dockerfile

@@ -27,7 +27,8 @@ RUN apt-get update && \
     libengine-pkcs11-openssl \
     opensc \
     uwsgi \
-    uwsgi-plugin-python3
+    uwsgi-plugin-python3 \
+    rake
 
 # create symbolic links for nginx-tests
 RUN mkdir -p /usr/local/lib/engines

Makefile

@@ -1,4 +1,4 @@
-PKG_VERSION=1.27.2+mod.2
+PKG_VERSION=1.27.2+mod.3
 PKG_REL_PREFIX=1hn1
 ifdef NO_CACHE
 DOCKER_NO_CACHE=--no-cache

debian/changelog

@@ -1,3 +1,10 @@
+nginx (1.27.2+mod.3-1hn1DebRelDistrib) UNRELEASED; urgency=medium
+
+  * add module
+  * bed251036c0f273fb42fa9e84c00767b15983956 modules/ngx_mruby (v1.18.6-938-gbed2510)
+
+ -- Hiroaki Nakamura <[email protected]>  Fri, 22 Nov 2024 22:41:52 +0900
+
 nginx (1.27.2+mod.2-1hn1DebRelDistrib) UNRELEASED; urgency=medium
 
   * openresty luajit v2.1-20241113

debian/control

@@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 9~),
                libgeoip-dev,
                libmhash-dev,
                libmaxminddb-dev,
-               libperl-dev
+               libperl-dev,
+               rake
 Standards-Version: 3.9.8.0
 Homepage: http://nginx.org
 

debian/rules

@@ -55,6 +55,9 @@ config.env.%:
 	cp -Pa $(CURDIR)/ModSecurity-nginx $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/njs $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/lua-resty-openssl $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/ngx_mruby $(BUILDDIR_$*)/
+	sed 's/@MRUBY_ROOT@//;s/@MRUBY_INCDIR@//;s/@MRUBY_LIBDIR@//' \
+		$(BUILDDIR_$*)/ngx_mruby/config.in > $(BUILDDIR_$*)/ngx_mruby/config
 	touch $@
 
 config.status.nginx: config.env.nginx
@@ -124,6 +127,7 @@ config.status.nginx: config.env.nginx
 		--add-dynamic-module=./srcache-nginx-module \
 		--add-dynamic-module=./njs/nginx \
 		--add-dynamic-module=./ModSecurity-nginx \
+		--add-dynamic-module=./ngx_mruby \
 		--without-pcre2 \
 		--with-cc-opt="$(CFLAGS)" \
 		--with-ld-opt="$(LDFLAGS)"
@@ -197,6 +201,7 @@ config.status.nginx_debug: config.env.nginx_debug
 		--add-dynamic-module=./srcache-nginx-module \
 		--add-dynamic-module=./njs/nginx \
 		--add-dynamic-module=./ModSecurity-nginx \
+		--add-dynamic-module=./ngx_mruby \
 		--without-pcre2 \
 		--with-cc-opt="$(CFLAGS)" \
 		--with-ld-opt="$(LDFLAGS)" \
@@ -206,6 +211,7 @@ config.status.nginx_debug: config.env.nginx_debug
 build-arch.%: config.status.%
 	dh_testdir
 	dh_prep
+	(cd $(BUILDDIR_$*)/ngx_mruby/mruby; make)
 	$(MAKE) -j$(NUMJOBS) -C $(BUILDDIR_$*) build
 
 build-arch: build-arch.nginx build-arch.nginx_debug