From 73c11ee216f727dc12d3901fb1f77d448933010c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 23 Dec 2024 23:16:10 +0900 Subject: [PATCH] Env variables syntax for proxies --- Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 3 --- Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 3 --- Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 3 --- Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh | 3 --- Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 3 --- env_vars/.env_prx | 2 +- 6 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 8b22bbdb2..d3d13ca91 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -372,9 +372,6 @@ create_db_schema_postgresql() { } update_zbx_config() { - local type=$1 - local db_type=$2 - echo "** Preparing Zabbix server configuration file" ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 8b22bbdb2..d3d13ca91 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -372,9 +372,6 @@ create_db_schema_postgresql() { } update_zbx_config() { - local type=$1 - local db_type=$2 - echo "** Preparing Zabbix server configuration file" ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 8b22bbdb2..d3d13ca91 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -372,9 +372,6 @@ create_db_schema_postgresql() { } update_zbx_config() { - local type=$1 - local db_type=$2 - echo "** Preparing Zabbix server configuration file" ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 8b22bbdb2..d3d13ca91 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -372,9 +372,6 @@ create_db_schema_postgresql() { } update_zbx_config() { - local type=$1 - local db_type=$2 - echo "** Preparing Zabbix server configuration file" ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index df6dfc12d..878c62ce0 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -372,9 +372,6 @@ create_db_schema_postgresql() { } update_zbx_config() { - local type=$1 - local db_type=$2 - echo "** Preparing Zabbix server configuration file" ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf diff --git a/env_vars/.env_prx b/env_vars/.env_prx index b567164d6..183ddf0df 100644 --- a/env_vars/.env_prx +++ b/env_vars/.env_prx @@ -1,7 +1,7 @@ # ZBX_PROXYMODE=0 # ZBX_SERVER_HOST=zabbix-server # ZBX_SERVER_PORT=10051 # Deprecated since 6.0.0 -# ZBX_HOSTNAME=zabbix-proxy-$db_type +# ZBX_HOSTNAME=zabbix-proxy- # ZBX_USE_NODE_NAME_AS_DB_NAME=false # ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 # ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0