diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index 699711282..d4bcab319 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -190,7 +190,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 882a6511f..dc425ca0a 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -199,7 +199,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 882a6511f..dc425ca0a 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -199,7 +199,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 9306d1d24..1ed2b1002 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -190,7 +190,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index e75230f00..85875a457 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -176,7 +176,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index e99d68f16..63936496d 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -185,7 +185,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index e99d68f16..63936496d 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -185,7 +185,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index df23eb279..9257e476e 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -180,7 +180,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index b53e296e6..cd7fc31ca 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -200,7 +200,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 9f0c04085..bbd9e5080 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -200,7 +200,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 9f0c04085..bbd9e5080 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -200,7 +200,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index 3d50dbf75..2acef975a 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -200,7 +200,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 9a604f4e7..0008cc14d 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -200,7 +200,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index fe6442890..a2ebfadaf 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -186,7 +186,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index a4df30514..e0e6e8a21 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -186,7 +186,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index a4df30514..e0e6e8a21 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -186,7 +186,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index f868f5acd..1d578ff9b 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -186,7 +186,7 @@ prepare_zbx_web_config() { export DB_SERVER_USER=${DB_SERVER_ZBX_USER} export DB_SERVER_PASS=${DB_SERVER_ZBX_PASS} export ZBX_SERVER_HOST=${ZBX_SERVER_HOST} - export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} + export ZBX_SERVER_PORT=${ZBX_SERVER_PORT} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} : ${ZBX_DB_ENCRYPTION:="false"}