Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Fixed multiple issues with variables check

Browse source
This commit is contained in:
Alexey Pustovalov 2026-04-08 13:24:28 +09:00
parent d349b1cebe
commit aa3b0a363c
9 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/entrypoints/java-gateway.sh
View file

@ -2,12 +2,12 @@
set -euo pipefail
ENTRYPOINT_LIBS="/usr/lib/docker-entrypoint"
readonly ENTRYPOINT_LIBS="/usr/lib/docker-entrypoint"
source "${ENTRYPOINT_LIBS}/logging.sh"
: "${JAVA:=/usr/bin/java}"
ZBX_GATEWAY_CONFIG="${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml"
ZABBIX_JAVA_DIR="/usr/sbin/zabbix_java"
readonly ZBX_GATEWAY_CONFIG="${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml"
readonly ZABBIX_JAVA_DIR="/usr/sbin/zabbix_java"
build_classpath() {
local classpath="lib"

1
templates/entrypoints/lib/clear_env.sh
View file

@ -7,6 +7,7 @@ clear_zbx_env() {
ZABBIX_*) unset "$env_var" ;;
DB_*) unset "$env_var" ;;
MYSQL_*) unset "$env_var" ;;
POSTGRES_*) unset "$env_var" ;;
esac
done < <(env)
}

2
templates/entrypoints/lib/config.sh
View file

@ -46,7 +46,7 @@ update_config_var() {
local is_multiple="${4:-false}"
local log_message
[[ -f "$config_path" ]] || { error "Missing configuration file: $config_path" >&2; exit 1; }
[[ -f "$config_path" ]] || error "Missing configuration file: $config_path"
if is_masked_config_var "$var_name" && [ -n "$var_value" ]; then
log_message="** Updating $config_path parameter '$var_name': '****'. Enable DEBUG_MODE to view value..."

2
templates/entrypoints/lib/nginx.sh
View file

@ -1,6 +1,8 @@
prepare_web_server() {
local fcgi_read_timeout
[[ -f "$NGINX_CONF_FILE" ]] || error "Missing configuration file: $NGINX_CONF_FILE"
if [ "$(id -u)" -eq 0 ]; then
sed -i -e "/^[#;] user/s/.*/user ${DAEMON_USER};/" "$NGINX_CONF_FILE"
fi

8
templates/entrypoints/lib/openssl.sh
View file

@ -1,7 +1,9 @@
openssl_rehash() {
local ssl_location="$1"
local ssl_location="${1:-}"
if command -v openssl >/dev/null 2>&1 && [ -n "$ssl_location:-}" ] && [ -d "$ssl_location" ]; then
openssl rehash "$ssl_location" >/dev/null
if command -v openssl >/dev/null 2>&1 && [ -n "$ssl_location" ] && [ -d "$ssl_location" ]; then
if ! openssl rehash "$ssl_location" >/dev/null; then
warn "openssl rehash failed for '$ssl_location'"
fi
fi
}

4
templates/entrypoints/lib/pgsql.sh
View file

@ -26,7 +26,7 @@ clear_pg_env() {
check_db_variables() {
local default_db_name="${1:-}"
: "${DB_SERVER_HOST:=postgres-server}"
: "${DB_SERVER_HOST=postgres-server}"
: "${DB_SERVER_PORT:=5432}"
: "${DB_SERVER_SCHEMA:=public}"
: "${POSTGRES_USE_IMPLICIT_SEARCH_PATH:=false}"
@ -43,7 +43,7 @@ check_db_variables() {
DB_SERVER_DBNAME="${POSTGRES_DB:-$default_db_name}"
psql_connect_args=(--port "${DB_SERVER_PORT}")
[ -n "${DB_SERVER_HOST}" ] && psql_connect_args=(--host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}")
[ -n "${DB_SERVER_HOST}" ] && psql_connect_args=(--host "${DB_SERVER_HOST}")
}
get_vault_secrets() {

6
templates/entrypoints/lib/php.sh
View file

@ -99,9 +99,9 @@ prepare_php_config() {
: "${ZBX_SERVER_TLS_ACTIVE:=0}"
export ZBX_SERVER_TLS_ACTIVE
file_process_from_env "ZBX_SERVER_TLS_CAFILE" "${ZBX_SERVER_TLS_CAFILE:-}" "${ZBX_SERVER_TLS_CA:-}"
file_process_from_env "ZBX_SERVER_TLS_KEYFILE" "${ZBX_SERVER_TLS_KEYFILE:-}" "${ZBX_SERVER_TLS_KEY:-}"
file_process_from_env "ZBX_SERVER_TLS_CERTFILE" "${ZBX_SERVER_TLS_CERTFILE:-}" "${ZBX_SERVER_TLS_CERT:-}"
file_process_from_env "${ZABBIX_INTERNAL_ENC_DIR}" "ZBX_SERVER_TLS_CAFILE" "${ZBX_SERVER_TLS_CAFILE:-}" "${ZBX_SERVER_TLS_CA:-}"
file_process_from_env "${ZABBIX_INTERNAL_ENC_DIR}" "ZBX_SERVER_TLS_KEYFILE" "${ZBX_SERVER_TLS_KEYFILE:-}" "${ZBX_SERVER_TLS_KEY:-}"
file_process_from_env "${ZABBIX_INTERNAL_ENC_DIR}" "ZBX_SERVER_TLS_CERTFILE" "${ZBX_SERVER_TLS_CERTFILE:-}" "${ZBX_SERVER_TLS_CERT:-}"
export ZBX_SERVER_TLS_CERT_ISSUER="${ZBX_SERVER_TLS_CERT_ISSUER:-}"
export ZBX_SERVER_TLS_CERT_SUBJECT="${ZBX_SERVER_TLS_CERT_SUBJECT:-}"

2
templates/entrypoints/proxy-mysql.sh
View file

@ -32,7 +32,7 @@ update_config() {
prepare_database() {
info "** Preparing database"
check_db_variables "zabbix-proxy"
check_db_variables "zabbix_proxy"
check_db_connect
create_db_user
create_db_database

1
templates/entrypoints/server-mysql.sh
View file

@ -7,7 +7,6 @@ source "${ENTRYPOINT_LIBS}/bootstrap.sh"
source "${ENTRYPOINT_LIBS}/mysql.sh"
source "${ENTRYPOINT_LIBS}/server-config.sh"
source "${ENTRYPOINT_LIBS}/openssl.sh"
update_config() {
[ -n "${DB_SERVER_SOCKET:-}" ] && export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"