1.20.0-debian-10-r13 release

bitnami/nginx/1.20/debian-10/Dockerfile

@@ -19,7 +19,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
 COPY rootfs /
 RUN /opt/bitnami/scripts/nginx/postunpack.sh
 ENV BITNAMI_APP_NAME="nginx" \
-    BITNAMI_IMAGE_VERSION="1.20.0-debian-10-r12" \
+    BITNAMI_IMAGE_VERSION="1.20.0-debian-10-r13" \
     NGINX_ENABLE_CUSTOM_PORTS="no" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \

bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh

@@ -181,7 +181,7 @@ validate_ipv4() {
     local stat=1
 
     if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-	read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
+        read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
         [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?

bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh

@@ -180,6 +180,7 @@ web_server_reload() {
 #   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
+#   --nginx-external-configuration - Configuration external to server block (no default)
 # Returns:
 #   true if the configuration was enabled, false otherwise
 ########################
@@ -220,7 +221,8 @@ ensure_web_server_app_configuration_exists() {
                 ;;
 
             # Specific NGINX flags
-            --nginx-additional-configuration)
+            --nginx-additional-configuration \
+            | --nginx-external-configuration)
                 nginx_args+=("${1//nginx-/}" "${2:?missing value}")
                 shift
                 ;;

bitnami/nginx/1.20/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh

@@ -172,6 +172,7 @@ nginx_initialize() {
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 #   --additional-configuration - Additional server block configuration (no default)
+#   --external-configuration - Configuration external to server block (no default)
 #   --document-root - Path to document root directory
 # Returns:
 #   true if the configuration was enabled, false otherwise
@@ -189,6 +190,7 @@ ensure_nginx_app_configuration_exists() {
     local var_name
     # Template variables defaults
     export additional_configuration=""
+    export external_configuration=""
     export document_root="${BITNAMI_ROOT_DIR}/${app}"
     # Validate arguments
     shift
@@ -205,6 +207,7 @@ ensure_nginx_app_configuration_exists() {
             | --http-port \
             | --https-port \
             | --additional-configuration \
+            | --external-configuration \
             | --document-root \
             | --extra-directory-configuration \
             )
@@ -247,6 +250,7 @@ absolute_redirect off;"
     # Indent configurations
     acl_configuration="$(indent "$acl_configuration" 4)"
     additional_configuration=$'\n'"$(indent "$additional_configuration" 4)"
+    external_configuration=$'\n'"$external_configuration"
     http_listen_configuration="$(indent "$http_listen_configuration" 4)"
     https_listen_configuration="$(indent "$https_listen_configuration" 4)"
     # Render templates

bitnami/nginx/1.20/debian-10/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-http-server-block.conf.tpl

@@ -1,3 +1,5 @@
+{{external_configuration}}
+
 server {
     # Port to listen on, can also be set in IP:PORT format
     {{http_listen_configuration}}

bitnami/nginx/1.20/debian-10/rootfs/opt/bitnami/scripts/nginx/bitnami-templates/app-https-server-block.conf.tpl

@@ -1,3 +1,5 @@
+{{external_configuration}}
+
 server {
     # Port to listen on, can also be set in IP:PORT format
     {{https_listen_configuration}}