From 6c225cce1fca02a37a0a86f5df50c9b1ad6a1a71 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 23 Jun 2020 15:24:14 +0300 Subject: [PATCH] Added DOUBLE_IEEE754 varaiable --- web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-mysql/alpine/docker-entrypoint.sh | 1 + web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-mysql/centos/docker-entrypoint.sh | 1 + web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-mysql/ubuntu/docker-entrypoint.sh | 1 + web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-pgsql/alpine/docker-entrypoint.sh | 1 + web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-pgsql/centos/docker-entrypoint.sh | 1 + web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-apache-pgsql/ubuntu/docker-entrypoint.sh | 1 + web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-mysql/alpine/docker-entrypoint.sh | 1 + web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-mysql/centos/docker-entrypoint.sh | 1 + web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-mysql/ubuntu/docker-entrypoint.sh | 1 + web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-pgsql/alpine/docker-entrypoint.sh | 1 + web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-pgsql/centos/docker-entrypoint.sh | 1 + web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 1 + 24 files changed, 24 insertions(+), 12 deletions(-) diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index d8dab5d47..f7499235e 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -252,6 +252,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index a95e092e8..b817433e9 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -252,6 +252,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index c9f21c9c6..f2a07403c 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -245,6 +245,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index 42b0fdc30..efe64cf40 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -251,6 +251,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index 29ecc69a4..5cd77aeec 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -254,6 +254,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index b5dc7f697..2e7490d5c 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -256,6 +256,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index c84d1e78c..f8717440a 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -280,6 +280,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 1476f75e3..6eb0ac402 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -280,6 +280,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 326200409..29f041457 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index a00ecbd05..39b9b902c 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -272,6 +272,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index f19affd65..4c159808c 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -281,6 +281,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index af071f410..5ffd5a008 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -281,6 +281,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG" diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index f351642a7..a964548fa 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -27,7 +27,7 @@ $DB['CIPHER_LIST'] = '{ZBX_DB_CIPHER_LIST}'; // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. -$DB['DOUBLE_IEEE754'] = true; +$DB['DOUBLE_IEEE754'] = {DB_DOUBLE_IEEE754}; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 491cbdfe5..2d31a16cd 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -277,6 +277,7 @@ prepare_zbx_web_config() { -e "s/{ZBX_DB_CA_FILE}/${ZBX_DB_CA_FILE}/g" \ -e "s/{ZBX_DB_VERIFY_HOST}/${ZBX_DB_VERIFY_HOST:-"false"}/g" \ -e "s/{ZBX_DB_CIPHER_LIST}/${ZBX_DB_CIPHER_LIST}/g" \ + -e "s/{DB_DOUBLE_IEEE754}/${DB_DOUBLE_IEEE754:-"true"}/g" \ -e "s/{ZBX_HISTORYSTORAGEURL}/$history_storage_url/g" \ -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \ "$ZBX_WEB_CONFIG"