From e09d4901eafbe7ca3b368b3f519fc47bd8ed5eab Mon Sep 17 00:00:00 2001
From: florian <contact@bunkerity.com>
Date: Mon, 4 Jul 2022 11:50:23 +0200
Subject: [PATCH] containers - fix regex for *^CUSTOM_CONF_*

---
 helpers/entrypoint.sh | 2 +-
 helpers/utils.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/entrypoint.sh b/helpers/entrypoint.sh
index 7b15d1243..2c60499c3 100644
--- a/helpers/entrypoint.sh
+++ b/helpers/entrypoint.sh
@@ -47,7 +47,7 @@ fi
 if [ "$SWARM_MODE" != "yes" ] && [ "$KUBERNETES_MODE" != "yes" ] && [ "$AUTOCONF_MODE" != "yes" ] ; then
 	# extract and drop configs
 	for var_name in $(python3 -c 'import os ; [print(k) for k in os.environ]') ; do
-		extracted=$(echo "$var_name" | sed -r 's/^([a-z\.\-]*)_?CUSTOM_CONF_(HTTP|DEFAULT_SERVER_HTTP|SERVER_HTTP|MODSEC|MODSEC_CRS)_(.*)$/\1 \2 \3/g')
+		extracted=$(echo "$var_name" | sed -r 's/^([0-9a-z\.\-]*)_?CUSTOM_CONF_(HTTP|DEFAULT_SERVER_HTTP|SERVER_HTTP|MODSEC|MODSEC_CRS)_(.*)$/\1 \2 \3/g')
 		site=$(echo "$extracted" | cut -d ' ' -f 1)
 		type=$(echo "$extracted" | cut -d ' ' -f 2 | grep -E '(HTTP|DEFAULT_SERVER_HTTP|SERVER_HTTP|MODSEC|MODSEC_CRS)' | tr '[:upper:]' '[:lower:]' | sed 's/_/-/')
 		name=$(echo "$extracted" | cut -d ' ' -f 3)
diff --git a/helpers/utils.sh b/helpers/utils.sh
index 1a421eab0..7b53961f5 100644
--- a/helpers/utils.sh
+++ b/helpers/utils.sh
@@ -54,7 +54,7 @@ function log() {
 # get only interesting env (var=value)
 function get_env() {
 for var_name in $(python3 -c 'import os ; [print(k) for k in os.environ]') ; do
-	filter=$(echo -n "$var_name" | sed -r 's/^(HOSTNAME|PWD|PKG_RELEASE|NJS_VERSION|SHLVL|PATH|_|NGINX_VERSION|HOME|([a-z\.\-]*)_?CUSTOM_CONF_(HTTP|DEFAULT_SERVER_HTTP|SERVER_HTTP|MODSEC|MODSEC_CRS)_(.*))$//g')
+	filter=$(echo -n "$var_name" | sed -r 's/^(HOSTNAME|PWD|PKG_RELEASE|NJS_VERSION|SHLVL|PATH|_|NGINX_VERSION|HOME|([0-9a-z\.\-]*)_?CUSTOM_CONF_(HTTP|DEFAULT_SERVER_HTTP|SERVER_HTTP|MODSEC|MODSEC_CRS)_(.*))$//g')
 	if [ "$filter" != "" ] ; then
         var_value=$(python3 -c "import os ; print(os.environ['${var_name}'])")
 		echo "${var_name}=${var_value}"