diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 684738c0f..e5ddc9521 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 684738c0f..e5ddc9521 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 684738c0f..e5ddc9521 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 30150c20e..ffb308ea8 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 0bc7a0204..44b02067a 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 e6c24ec1f..290590be8 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