Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov 2021-02-17 07:46:36 -05:00
commit c560ce8998
6 changed files with 30 additions and 45 deletions

View File

@ -11,22 +11,20 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'
@ -129,7 +127,6 @@ check_db_connect() {
fi fi
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
echo "********************"
fi fi
echo "********************" echo "********************"

View File

@ -11,22 +11,20 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'
@ -129,7 +127,6 @@ check_db_connect() {
fi fi
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
echo "********************"
fi fi
echo "********************" echo "********************"

View File

@ -11,22 +11,20 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'
@ -129,7 +127,6 @@ check_db_connect() {
fi fi
echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
echo "********************"
fi fi
echo "********************" echo "********************"

View File

@ -11,25 +11,23 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'

View File

@ -11,25 +11,23 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'

View File

@ -11,25 +11,23 @@ fi
# Default Zabbix installation name # Default Zabbix installation name
# Used only by Zabbix web-interface # Used only by Zabbix web-interface
ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"} : ${ZBX_SERVER_NAME:="Zabbix docker"}
# Default Zabbix server host # Default Zabbix server host
ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"} : ${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:="10051"}
# Default timezone for web interface # Default timezone for web interface
PHP_TZ=${PHP_TZ:-"Europe/Riga"} : ${PHP_TZ:="Europe/Riga"}
#Enable PostgreSQL timescaleDB feature: #Enable PostgreSQL timescaleDB feature:
ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"}
# Default directories # Default directories
# User 'zabbix' home directory
ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
# Configuration files directory # Configuration files directory
ZABBIX_ETC_DIR="/etc/zabbix" ZABBIX_ETC_DIR="/etc/zabbix"
# Web interface www-root directory # Web interface www-root directory
ZBX_FRONTEND_PATH="/usr/share/zabbix" ZABBIX_WWW_ROOT="/usr/share/zabbix"
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# as example: file_env 'MYSQL_PASSWORD' 'zabbix' # as example: file_env 'MYSQL_PASSWORD' 'zabbix'