diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 585ac1074..8796f8845 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,8 +50,6 @@ jobs: exclude: - os: centos build: agent2 - - os: ubuntu - build: agent2 runs-on: ubuntu-20.04 steps: diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh index 9c8fc5791..4306b3d9a 100755 --- a/agent/alpine/docker-entrypoint.sh +++ b/agent/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -136,7 +136,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" : ${ZBX_PASSIVE_ALLOW:="true"} - if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then + if [ "${ZBX_PASSIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks" update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}" else @@ -148,7 +148,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}" : ${ZBX_ACTIVE_ALLOW:="true"} - if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then + if [ "${ZBX_ACTIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks" update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}" else diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh index 9c8fc5791..4306b3d9a 100755 --- a/agent/centos/docker-entrypoint.sh +++ b/agent/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -136,7 +136,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" : ${ZBX_PASSIVE_ALLOW:="true"} - if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then + if [ "${ZBX_PASSIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks" update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}" else @@ -148,7 +148,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}" : ${ZBX_ACTIVE_ALLOW:="true"} - if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then + if [ "${ZBX_ACTIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks" update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}" else diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh index 9c8fc5791..4306b3d9a 100755 --- a/agent/ubuntu/docker-entrypoint.sh +++ b/agent/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -136,7 +136,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" : ${ZBX_PASSIVE_ALLOW:="true"} - if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then + if [ "${ZBX_PASSIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks" update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}" else @@ -148,7 +148,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}" : ${ZBX_ACTIVE_ALLOW:="true"} - if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then + if [ "${ZBX_ACTIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks" update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}" else diff --git a/agent2/alpine/docker-entrypoint.sh b/agent2/alpine/docker-entrypoint.sh index 5cad1e570..1476e10a4 100755 --- a/agent2/alpine/docker-entrypoint.sh +++ b/agent2/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -136,7 +136,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" : ${ZBX_PASSIVE_ALLOW:="true"} - if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then + if [ "${ZBX_PASSIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks" update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}" else @@ -147,14 +147,14 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}" : ${ZBX_ACTIVE_ALLOW:="true"} - if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then + if [ "${ZBX_ACTIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks" update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}" else update_config_var $ZBX_AGENT_CONFIG "ServerActive" fi - if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then + if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "PersistentBufferFile" "$ZABBIX_USER_HOME_DIR/buffer/" update_config_var $ZBX_AGENT_CONFIG "PersistentBufferPeriod" "${ZBX_PERSISTENTBUFFERPERIOD}" @@ -162,7 +162,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "0" fi - if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then + if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then update_config_var $ZBX_AGENT_CONFIG "StatusPort" "31999" fi diff --git a/agent2/ubuntu/docker-entrypoint.sh b/agent2/ubuntu/docker-entrypoint.sh index 5cad1e570..1476e10a4 100755 --- a/agent2/ubuntu/docker-entrypoint.sh +++ b/agent2/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -136,7 +136,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}" : ${ZBX_PASSIVE_ALLOW:="true"} - if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then + if [ "${ZBX_PASSIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks" update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}" else @@ -147,14 +147,14 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}" : ${ZBX_ACTIVE_ALLOW:="true"} - if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then + if [ "${ZBX_ACTIVE_ALLOW,,}" == "true" ]; then echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks" update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}" else update_config_var $ZBX_AGENT_CONFIG "ServerActive" fi - if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then + if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "PersistentBufferFile" "$ZABBIX_USER_HOME_DIR/buffer/" update_config_var $ZBX_AGENT_CONFIG "PersistentBufferPeriod" "${ZBX_PERSISTENTBUFFERPERIOD}" @@ -162,7 +162,7 @@ prepare_zbx_agent_config() { update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "0" fi - if [ "$ZBX_ENABLESTATUSPORT" == "true" ]; then + if [ "${ZBX_ENABLESTATUSPORT,,}" == "true" ]; then update_config_var $ZBX_AGENT_CONFIG "StatusPort" "31999" fi diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index ec5223733..01ac14cd1 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index ec5223733..01ac14cd1 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index ec5223733..01ac14cd1 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index ae6d185c8..548b52ccb 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -150,17 +150,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -170,7 +170,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -208,7 +208,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -378,7 +378,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -395,7 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 45ac14e12..87ae89274 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -150,17 +150,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -170,7 +170,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -206,7 +206,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -376,7 +376,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -393,7 +393,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 8c6dd377c..ced972b18 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -150,17 +150,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -170,7 +170,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -205,7 +205,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -375,7 +375,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -392,7 +392,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 4fae7846d..229d56a92 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -170,7 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -187,7 +187,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 4fae7846d..229d56a92 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -170,7 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -187,7 +187,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index c991f3974..5bc90dac0 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -170,7 +170,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -187,7 +187,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 50605bc0f..ae23bc659 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -145,17 +145,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -165,7 +165,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -203,7 +203,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -365,7 +365,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -382,7 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 0527f89c3..3aa594d5d 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -145,17 +145,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -165,7 +165,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -200,7 +200,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -379,7 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index d67944c92..84a89d077 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -145,17 +145,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -165,7 +165,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -200,7 +200,7 @@ check_db_connect_mysql() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -379,7 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index 48c0e6914..d0ac418ec 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -5,12 +5,12 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi #Enable PostgreSQL timescaleDB feature: -ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} +: ${ENABLE_TIMESCALEDB:="false"} # Default directories # User 'zabbix' home directory @@ -162,7 +162,7 @@ check_db_connect_postgresql() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" fi @@ -288,7 +288,7 @@ create_db_schema_postgresql() { if [ -z "${ZBX_DB_VERSION}" ]; then echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL" - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then psql_query "CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;" fi @@ -312,7 +312,7 @@ create_db_schema_postgresql() { --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | psql --quiet \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1 @@ -399,7 +399,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -416,7 +416,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index 48c0e6914..d0ac418ec 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -5,12 +5,12 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi #Enable PostgreSQL timescaleDB feature: -ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} +: ${ENABLE_TIMESCALEDB:="false"} # Default directories # User 'zabbix' home directory @@ -162,7 +162,7 @@ check_db_connect_postgresql() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" fi @@ -288,7 +288,7 @@ create_db_schema_postgresql() { if [ -z "${ZBX_DB_VERSION}" ]; then echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL" - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then psql_query "CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;" fi @@ -312,7 +312,7 @@ create_db_schema_postgresql() { --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | psql --quiet \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1 @@ -399,7 +399,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -416,7 +416,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index 19ba75386..c250ce68b 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -5,12 +5,12 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi #Enable PostgreSQL timescaleDB feature: -ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} +: ${ENABLE_TIMESCALEDB:="false"} # Default directories # User 'zabbix' home directory @@ -162,7 +162,7 @@ check_db_connect_postgresql() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}" echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}" fi @@ -288,7 +288,7 @@ create_db_schema_postgresql() { if [ -z "${ZBX_DB_VERSION}" ]; then echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL" - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then psql_query "CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;" fi @@ -312,7 +312,7 @@ create_db_schema_postgresql() { --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 - if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then + if [ "${ENABLE_TIMESCALEDB,,}" == "true" ]; then cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | psql --quiet \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1 @@ -399,7 +399,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}" : ${ZBX_JAVAGATEWAY_ENABLE:="false"} - if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then + if [ "${ZBX_JAVAGATEWAY_ENABLE,,}" == "true" ]; then update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}" update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}" update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}" @@ -416,7 +416,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else diff --git a/snmptraps/alpine/README.md b/snmptraps/alpine/README.md index 35e120ef6..471da9d1d 100644 --- a/snmptraps/alpine/README.md +++ b/snmptraps/alpine/README.md @@ -48,7 +48,7 @@ Where `some-zabbix-snmptraps` is the name you want to assign to your container a ## Linking Zabbix server or Zabbix proxy with the container - docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -p 162:1162/udp -d zabbix/zabbix-server:tag + docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -d zabbix/zabbix-server:tag ## Container shell access and viewing Zabbix snmptraps logs diff --git a/snmptraps/centos/README.md b/snmptraps/centos/README.md index 35e120ef6..471da9d1d 100644 --- a/snmptraps/centos/README.md +++ b/snmptraps/centos/README.md @@ -48,7 +48,7 @@ Where `some-zabbix-snmptraps` is the name you want to assign to your container a ## Linking Zabbix server or Zabbix proxy with the container - docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -p 162:1162/udp -d zabbix/zabbix-server:tag + docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -d zabbix/zabbix-server:tag ## Container shell access and viewing Zabbix snmptraps logs diff --git a/snmptraps/ubuntu/README.md b/snmptraps/ubuntu/README.md index 35e120ef6..471da9d1d 100644 --- a/snmptraps/ubuntu/README.md +++ b/snmptraps/ubuntu/README.md @@ -48,7 +48,7 @@ Where `some-zabbix-snmptraps` is the name you want to assign to your container a ## Linking Zabbix server or Zabbix proxy with the container - docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -p 162:1162/udp -d zabbix/zabbix-server:tag + docker run --name some-zabbix-server --link some-zabbix-snmptraps:zabbix-snmptraps --volumes-from some-zabbix-snmptraps -d zabbix/zabbix-server:tag ## Container shell access and viewing Zabbix snmptraps logs diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 9176c0599..42b325f0f 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,6 +17,9 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} + # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -63,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -83,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -117,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -167,7 +170,8 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -189,17 +193,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -212,7 +219,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/apache2/httpd.conf" diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index 2976cc8d8..ad515e169 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,6 +17,9 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} + # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -63,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -83,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -117,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -176,7 +179,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -198,17 +202,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -221,7 +228,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/httpd/conf/httpd.conf" diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index f7fcae8d7..0a955ebb7 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,6 +17,9 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} + # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -63,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -83,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -117,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -167,7 +170,8 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -189,17 +193,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -212,7 +219,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/apache2/apache2.conf" diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index fdaac5bb5..2b23f2026 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,6 +17,9 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} + # Default directories # Configuration files directory ZABBIX_ETC_DIR="/etc/zabbix" @@ -80,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -151,7 +154,8 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -173,17 +177,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -196,7 +203,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/apache2/httpd.conf" diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index 72fadfca2..5e7807e4d 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,8 +17,8 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -#Enable PostgreSQL timescaleDB feature: -ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} # Default directories # Configuration files directory @@ -83,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -163,7 +163,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -185,17 +186,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -208,7 +212,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/httpd/conf/httpd.conf" diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 9b6d7bec1..cb8e9cb4c 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,8 +17,8 @@ fi # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} -#Enable PostgreSQL timescaleDB feature: -ENABLE_TIMESCALEDB=${ENABLE_TIMESCALEDB:-"false"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} # Default directories # Configuration files directory @@ -83,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -158,7 +158,8 @@ clear_deploy() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -180,17 +181,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -203,7 +207,9 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*CustomLog)\s+\S+!\1 /dev/null!g' \ "/etc/apache2/apache2.conf" diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index a08f0a8ee..e2feddbf1 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -66,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -86,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -96,7 +96,7 @@ check_variables() { db_tls_params() { local result="" - if [ "${ZBX_DB_ENCRYPTION}" == "true" ]; then + if [ "${ZBX_DB_ENCRYPTION,,}" == "true" ]; then result="--ssl" if [ -n "${ZBX_DB_CA_FILE}" ]; then @@ -120,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -180,7 +180,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -202,17 +203,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} - + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} + export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -236,7 +240,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index a65b943a6..3d50dbf75 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -66,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -86,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -96,7 +96,7 @@ check_variables() { db_tls_params() { local result="" - if [ "${ZBX_DB_ENCRYPTION}" == "true" ]; then + if [ "${ZBX_DB_ENCRYPTION,,}" == "true" ]; then result="--ssl-mode=required" if [ -n "${ZBX_DB_CA_FILE}" ]; then @@ -120,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -180,7 +180,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -202,17 +203,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -236,7 +240,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 73fa558ae..6c5e1b7b1 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -66,17 +66,17 @@ check_variables() { file_env MYSQL_USER file_env MYSQL_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -86,7 +86,7 @@ check_variables() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -96,7 +96,7 @@ check_variables() { db_tls_params() { local result="" - if [ "${ZBX_DB_ENCRYPTION}" == "true" ]; then + if [ "${ZBX_DB_ENCRYPTION,,}" == "true" ]; then result="--ssl-mode=required" if [ -n "${ZBX_DB_CA_FILE}" ]; then @@ -120,7 +120,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -180,7 +180,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -202,17 +203,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -236,7 +240,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index e97c6ac19..0aa23bd47 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -83,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -164,7 +164,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -186,17 +187,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -218,7 +222,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index d68f6aa9a..e55696ad3 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -83,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -164,7 +164,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -186,17 +187,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -218,7 +222,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 37e5e8440..aaefdf8d0 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -83,7 +83,7 @@ check_db_connect() { echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -164,7 +164,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -186,17 +187,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:="false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -218,7 +222,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf" diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index a0670f3be..af4a5bdac 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -5,7 +5,7 @@ set -o pipefail set +e # Script trace mode -if [ "${DEBUG_MODE}" == "true" ]; then +if [ "${DEBUG_MODE,,}" == "true" ]; then set -o xtrace fi @@ -17,6 +17,9 @@ fi : ${DB_SERVER_HOST:="localhost"} : ${DB_SERVER_PORT:="3306"} +# Default timezone for web interface +: ${PHP_TZ:="Europe/Riga"} + # Default directories # User 'zabbix' home directory ZABBIX_USER_HOME_DIR="/var/lib/zabbix" @@ -199,17 +202,17 @@ check_variables_mysql() { file_env MYSQL_ROOT_PASSWORD - if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD,,}" == "true" ]; then echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password" exit 1 fi - if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" != "true" ]; then + if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty" exit 1 fi - if [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then + if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then USE_DB_ROOT_USER=true DB_SERVER_ROOT_USER="root" DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} @@ -219,7 +222,7 @@ check_variables_mysql() { # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} - [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} + [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}} DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"} DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"} @@ -257,7 +260,7 @@ check_db_connect() { echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" - if [ "${DEBUG_MODE}" == "true" ]; then + if [ "${DEBUG_MODE,,}" == "true" ]; then if [ "${USE_DB_ROOT_USER}" == "true" ]; then echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}" echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}" @@ -457,7 +460,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}" : ${ZBX_ENABLE_SNMP_TRAPS:="false"} - if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then + if [ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]; then update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log" update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1" else @@ -545,7 +548,8 @@ prepare_zbx_web_config() { echo "listen.group = nginx" >> "$PHP_CONFIG_FILE" fi - export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + : ${ZBX_DENY_GUI_ACCESS:="false"} + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS,,} export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} @@ -567,17 +571,20 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT="10051" export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} - export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION:-"false"} + : ${ZBX_DB_ENCRYPTION:-"false"} + export ZBX_DB_ENCRYPTION=${ZBX_DB_ENCRYPTION,,} export ZBX_DB_KEY_FILE=${ZBX_DB_KEY_FILE} export ZBX_DB_CERT_FILE=${ZBX_DB_CERT_FILE} export ZBX_DB_CA_FILE=${ZBX_DB_CA_FILE} - export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST-"false"} + : ${ZBX_DB_VERIFY_HOST:="false"} + export ZBX_DB_VERIFY_HOST=${ZBX_DB_VERIFY_HOST,,} export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} - export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754:-"true"} + : ${DB_DOUBLE_IEEE754:="true"} + export DB_DOUBLE_IEEE754=${DB_DOUBLE_IEEE754,,} export ZBX_HISTORYSTORAGEURL=${ZBX_HISTORYSTORAGEURL} export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} @@ -601,7 +608,9 @@ prepare_zbx_web_config() { "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi - if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then + : ${ENABLE_WEB_ACCESS_LOG:="true"} + + if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ "/etc/nginx/nginx.conf"