extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-11 09:01:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.2

Browse Source
This commit is contained in:
root 2019-04-11 17:08:47 +03:00
commit 80f75e5304
34 changed files with 102 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
agent/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
agent/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
java-gateway/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
java-gateway/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-mysql/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-mysql/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-pgsql/centos/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

5
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"

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

@ -653,10 +653,11 @@ update_zbx_config() {
fi fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else else
update_config_var $ZBX_CONFIG "ListenPort" update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}" update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console" update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile" update_config_var $ZBX_CONFIG "LogFile"