From 15ffcfc51ed308807cabbf5e17d6d2f7dfdd9ae1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 12 Apr 2018 01:28:04 +0300 Subject: [PATCH] Fixed font config for trunk web-interface --- web-apache-mysql/alpine/conf/tmp/font-config | 8 ++++---- web-apache-pgsql/alpine/conf/tmp/font-config | 8 ++++---- web-nginx-mysql/alpine/conf/tmp/font-config | 8 ++++---- web-nginx-pgsql/alpine/conf/tmp/font-config | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web-apache-mysql/alpine/conf/tmp/font-config b/web-apache-mysql/alpine/conf/tmp/font-config index f28ef2e17..86f24aba6 100644 --- a/web-apache-mysql/alpine/conf/tmp/font-config +++ b/web-apache-mysql/alpine/conf/tmp/font-config @@ -1,7 +1,7 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/frontends/php/include/defines.inc.php --- zabbix-2.5.0.orig/frontends/php/include/defines.inc.php 2015-08-19 17:27:39.000000000 +0900 +++ zabbix-2.5.0/frontends/php/include/defines.inc.php 2015-08-22 15:20:12.000000000 +0900 -@@ -42,7 +42,7 @@ +@@ -51,7 +51,7 @@ define('ZBX_WIDGET_ROWS', 20); define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) @@ -10,9 +10,9 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/f define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up define('ZBX_SCRIPT_TIMEOUT', 60); // in seconds -@@ -90,7 +90,7 @@ - define('EVENTS_OPTION_ALL', 2); - define('EVENTS_OPTION_NOT_ACK', 3); +@@ -96,7 +96,7 @@ + define('ZBX_ACK_STS_WITH_UNACK', 2); + define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); -define('ZBX_FONT_NAME', 'DejaVuSans'); +define('ZBX_FONT_NAME', 'graphfont'); diff --git a/web-apache-pgsql/alpine/conf/tmp/font-config b/web-apache-pgsql/alpine/conf/tmp/font-config index f28ef2e17..86f24aba6 100644 --- a/web-apache-pgsql/alpine/conf/tmp/font-config +++ b/web-apache-pgsql/alpine/conf/tmp/font-config @@ -1,7 +1,7 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/frontends/php/include/defines.inc.php --- zabbix-2.5.0.orig/frontends/php/include/defines.inc.php 2015-08-19 17:27:39.000000000 +0900 +++ zabbix-2.5.0/frontends/php/include/defines.inc.php 2015-08-22 15:20:12.000000000 +0900 -@@ -42,7 +42,7 @@ +@@ -51,7 +51,7 @@ define('ZBX_WIDGET_ROWS', 20); define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) @@ -10,9 +10,9 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/f define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up define('ZBX_SCRIPT_TIMEOUT', 60); // in seconds -@@ -90,7 +90,7 @@ - define('EVENTS_OPTION_ALL', 2); - define('EVENTS_OPTION_NOT_ACK', 3); +@@ -96,7 +96,7 @@ + define('ZBX_ACK_STS_WITH_UNACK', 2); + define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); -define('ZBX_FONT_NAME', 'DejaVuSans'); +define('ZBX_FONT_NAME', 'graphfont'); diff --git a/web-nginx-mysql/alpine/conf/tmp/font-config b/web-nginx-mysql/alpine/conf/tmp/font-config index f28ef2e17..86f24aba6 100644 --- a/web-nginx-mysql/alpine/conf/tmp/font-config +++ b/web-nginx-mysql/alpine/conf/tmp/font-config @@ -1,7 +1,7 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/frontends/php/include/defines.inc.php --- zabbix-2.5.0.orig/frontends/php/include/defines.inc.php 2015-08-19 17:27:39.000000000 +0900 +++ zabbix-2.5.0/frontends/php/include/defines.inc.php 2015-08-22 15:20:12.000000000 +0900 -@@ -42,7 +42,7 @@ +@@ -51,7 +51,7 @@ define('ZBX_WIDGET_ROWS', 20); define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) @@ -10,9 +10,9 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/f define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up define('ZBX_SCRIPT_TIMEOUT', 60); // in seconds -@@ -90,7 +90,7 @@ - define('EVENTS_OPTION_ALL', 2); - define('EVENTS_OPTION_NOT_ACK', 3); +@@ -96,7 +96,7 @@ + define('ZBX_ACK_STS_WITH_UNACK', 2); + define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); -define('ZBX_FONT_NAME', 'DejaVuSans'); +define('ZBX_FONT_NAME', 'graphfont'); diff --git a/web-nginx-pgsql/alpine/conf/tmp/font-config b/web-nginx-pgsql/alpine/conf/tmp/font-config index f28ef2e17..86f24aba6 100644 --- a/web-nginx-pgsql/alpine/conf/tmp/font-config +++ b/web-nginx-pgsql/alpine/conf/tmp/font-config @@ -1,7 +1,7 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/frontends/php/include/defines.inc.php --- zabbix-2.5.0.orig/frontends/php/include/defines.inc.php 2015-08-19 17:27:39.000000000 +0900 +++ zabbix-2.5.0/frontends/php/include/defines.inc.php 2015-08-22 15:20:12.000000000 +0900 -@@ -42,7 +42,7 @@ +@@ -51,7 +51,7 @@ define('ZBX_WIDGET_ROWS', 20); define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18) @@ -10,9 +10,9 @@ diff -Nru zabbix-2.5.0.orig/frontends/php/include/defines.inc.php zabbix-2.5.0/f define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up define('ZBX_SCRIPT_TIMEOUT', 60); // in seconds -@@ -90,7 +90,7 @@ - define('EVENTS_OPTION_ALL', 2); - define('EVENTS_OPTION_NOT_ACK', 3); +@@ -96,7 +96,7 @@ + define('ZBX_ACK_STS_WITH_UNACK', 2); + define('ZBX_ACK_STS_WITH_LAST_UNACK', 3); -define('ZBX_FONT_NAME', 'DejaVuSans'); +define('ZBX_FONT_NAME', 'graphfont');