diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 0f770ab42..6ff450c67 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -179,7 +176,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index 41647aa2a..0e64bdb55 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -188,7 +185,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index b20e16ef3..2b46916c8 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -179,7 +176,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index 32be2bf07..b52d56d5c 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -163,7 +160,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index ca7eb0415..b6684fafa 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - #Enable PostgreSQL timescaleDB feature: ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} @@ -175,7 +172,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index db3c9bddc..e359a2014 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -17,9 +17,6 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - #Enable PostgreSQL timescaleDB feature: ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} @@ -170,7 +167,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index dc0011932..d433dd373 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - # Default directories # User 'zabbix' home directory ZABBIX_USER_HOME_DIR="/var/lib/zabbix" @@ -192,7 +189,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 479ca9e1e..80a0c803a 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - # Default directories # User 'zabbix' home directory ZABBIX_USER_HOME_DIR="/var/lib/zabbix" @@ -192,7 +189,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 200f94042..28bb9f710 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - # Default directories # User 'zabbix' home directory ZABBIX_USER_HOME_DIR="/var/lib/zabbix" @@ -192,7 +189,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index ee2b40aa2..e7c95b40d 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - #Enable PostgreSQL timescaleDB feature: ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} @@ -178,7 +175,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 5c130e38c..81582c755 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - #Enable PostgreSQL timescaleDB feature: ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} @@ -178,7 +175,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index a1e7e5975..7c2d2081c 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} # Default Zabbix server port number ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} -# Default timezone for web interface -PHP_TZ=${PHP_TZ:-"Europe/Riga"} - #Enable PostgreSQL timescaleDB feature: ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} @@ -178,7 +175,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="POSTGRESQL" export DB_SERVER_HOST=${DB_SERVER_HOST} diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index 8b6a80aff..db228d0ca 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -13,9 +13,6 @@ fi # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default timezone for web interface -: ${PHP_TZ:="Europe/Riga"} - # Default MySQL instance location : ${DB_SERVER_HOST:="localhost"} : ${DB_SERVER_PORT:="3306"} @@ -557,7 +554,7 @@ prepare_zbx_web_config() { export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} - export PHP_TZ=${PHP_TZ:-"Europe/Riga"} + export PHP_TZ=${PHP_TZ} export DB_SERVER_TYPE="MYSQL" export DB_SERVER_HOST=${DB_SERVER_HOST}