extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-04-01 10:46:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use system timezone by default

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-10-08 09:29:10 -04:00
parent b0daef4f5a
commit cc060568db
13 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
@ -179,7 +176,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
@ -188,7 +185,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
@ -179,7 +176,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
@ -163,7 +160,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
@ -175,7 +172,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ fi
# Default Zabbix server port number # Default Zabbix server port number
: ${ZBX_SERVER_PORT:="10051"} : ${ZBX_SERVER_PORT:="10051"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
@ -170,7 +167,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory # User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
@ -192,7 +189,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory # User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
@ -192,7 +189,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory # User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix" ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
@ -192,7 +189,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
@ -178,7 +175,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
@ -178,7 +175,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -17,9 +17,6 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
# Default Zabbix server port number # Default Zabbix server port number
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
@ -178,7 +175,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="POSTGRESQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}

5
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -13,9 +13,6 @@ fi
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
: ${ZBX_SERVER_NAME:="Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default timezone for web interface
: ${PHP_TZ:="Europe/Riga"}
# Default MySQL instance location # Default MySQL instance location
: ${DB_SERVER_HOST:="localhost"} : ${DB_SERVER_HOST:="localhost"}
: ${DB_SERVER_PORT:="3306"} : ${DB_SERVER_PORT:="3306"}
@ -557,7 +554,7 @@ prepare_zbx_web_config() {
export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"}
export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"} export ZBX_UPLOADMAXFILESIZE=${ZBX_UPLOADMAXFILESIZE:-"2M"}
export ZBX_MAXINPUTTIME=${ZBX_MAXINPUTTIME:-"300"} 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_TYPE="MYSQL"
export DB_SERVER_HOST=${DB_SERVER_HOST} export DB_SERVER_HOST=${DB_SERVER_HOST}