Possible specify PSK key using full path to file

(cherry picked from commit 8bed89afce)

Dockerfiles/agent/alpine/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent/centos/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent/ol/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent/rhel/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent/ubuntu/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent2/alpine/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent2/centos/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent2/ol/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent2/rhel/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/agent2/ubuntu/docker-entrypoint.sh

@@ -72,7 +72,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh

@@ -102,7 +102,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh

@@ -102,7 +102,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh

@@ -102,7 +102,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh

@@ -102,7 +102,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh

@@ -102,7 +102,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh

@@ -71,7 +71,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh

@@ -71,7 +71,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh

@@ -71,7 +71,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh

@@ -71,7 +71,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh

@@ -71,7 +71,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-mysql/alpine/docker-entrypoint.sh

@@ -97,7 +97,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-mysql/centos/docker-entrypoint.sh

@@ -97,7 +97,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-mysql/ol/docker-entrypoint.sh

@@ -97,7 +97,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-mysql/rhel/docker-entrypoint.sh

@@ -97,7 +97,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh

@@ -97,7 +97,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh

@@ -100,7 +100,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-pgsql/centos/docker-entrypoint.sh

@@ -100,7 +100,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-pgsql/ol/docker-entrypoint.sh

@@ -100,7 +100,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh

@@ -100,7 +100,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi
 

Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh

@@ -110,7 +110,7 @@ update_config_var() {
     fi
 
     # Use full path to a file for TLS related configuration parameters
-    if [[ $var_name =~ ^TLS.*File$ ]]; then
+    if [[ $var_name =~ ^TLS.*File$ ]] && [[ ! $var_value =~ ^/.+$ ]]; then
         var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
     fi