NODE-5465 Bump versions: Alpine 3.20, Nginx 1.26.1

Makefile

@@ -6,10 +6,10 @@ SHELL=/bin/bash -o pipefail -o errexit
 
 -include .env
 
-AIO_VERSION       ?= 4.10.6
+AIO_VERSION       ?= 4.10.7
 CONTAINER_VERSION ?= test
-ALPINE_VERSION    = 3.18
-NGINX_VERSION     = 1.24.0
+ALPINE_VERSION    = 3.20
+NGINX_VERSION     = 1.26.1
 WLRM_FOLDER       = stable-$(shell echo ${NGINX_VERSION} | sed 's/\.//g')
 GOMPLATE_VERISON  = 3.11.7
 COMMIT_SHA        ?= git-$(shell git rev-parse --short HEAD)

conf/nginx/nginx.conf

@@ -11,6 +11,8 @@ events {
 }
 
 http {
+    # Auto-inclusion of apifw into server blocks
+    wallarm_srv_include /etc/nginx/wallarm-apifw-loc.conf;
 
     ##
     # Basic Settings

conf/nginx/wallarm-apifw-loc.conf

@@ -0,0 +1,18 @@
+# wallarm-apifw-loc, required for APIFW.
+
+# Will be automatically included in each "server" section of the NGINX configuration
+# to enable the API Firewall functionality.
+
+location ~ ^/wallarm-apifw(.*)$ {
+	wallarm_mode off;
+	proxy_pass http://127.0.0.1:8088$1;
+	error_page 404 431         = @wallarm-apifw-fallback;
+	error_page 500 502 503 504 = @wallarm-apifw-fallback;
+	allow 127.0.0.0/8;
+	deny all;
+}
+
+location @wallarm-apifw-fallback {
+	wallarm_mode off;
+	return 500 "API FW fallback";
+}

conf/nginx_templates/default.conf.tmpl

@@ -39,23 +39,6 @@ server {
         }
         {{ end }}
 
-        {{ if or (eq (env.Getenv "WALLARM_APIFW_ENABLE") "") (and (ne (env.Getenv "WALLARM_APIFW_ENABLE") "False") (ne (env.Getenv "WALLARM_APIFW_ENABLE") "false")) -}}
-        location ~ ^/wallarm-apifw(.*)$ {
-                wallarm_mode off;
-                proxy_pass http://127.0.0.1:8088$1;
-                error_page 404 431         = @wallarm-apifw-fallback;
-                error_page 500 502 503 504 = @wallarm-apifw-fallback;
-
-                allow 127.0.0.0/8;
-                deny all;
-        }
-
-        location @wallarm-apifw-fallback {
-                wallarm_mode off;
-                return 500 "API FW fallback";
-        }
-        {{ end }}
-
         location / {
                 {{ $nginxBackend := "http://127.0.0.1:8080" }}
                 {{ if env.Getenv "NGINX_BACKEND" -}}

scripts/init

@@ -125,6 +125,8 @@ configure_services() {
   then
     sed -i -e '/\[program:api-firewall\]/,/\/api-firewall-out.log/d' \
       /opt/wallarm/etc/supervisord.conf
+    sed -i -e '/wallarm-apifw-loc/d' \
+      /etc/nginx/nginx.conf
   fi
 }
 

test/nginx_conf/wallarm_node.conf

@@ -53,16 +53,4 @@ server {
                 proxy_set_header X-Real-IP $remote_addr;
                 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
-
-        # apifw
-        location ~ ^/wallarm-apifw(.*)$ {
-            wallarm_mode off;
-            proxy_pass http://127.0.0.1:8088$1;
-            error_page 404 431         = @wallarm-apifw-fallback;
-            error_page 500 502 503 504 = @wallarm-apifw-fallback;
-        }
-        location @wallarm-apifw-fallback {
-            wallarm_mode off;
-            return 500 "API FW fallback";
-        }
 }