--- rpms/smeserver-zabbix-server/contribs9/smeserver-zabbix-server-0.1-zabbix4.4.6.patch	2020/05/14 01:17:39	1.3
+++ rpms/smeserver-zabbix-server/contribs9/smeserver-zabbix-server-0.1-zabbix4.4.6.patch	2020/05/14 02:21:50	1.4
@@ -1,7 +1,16 @@
 diff -Nur smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
---- smeserver-zabbix-server-0.1.old/createlinks	2020-05-10 01:38:01.417000000 -0400
-+++ smeserver-zabbix-server-0.1/createlinks	2020-05-10 03:07:02.122000000 -0400
-@@ -15,10 +15,11 @@
+--- smeserver-zabbix-server-0.1.old/createlinks	2020-05-13 22:05:14.431000000 -0400
++++ smeserver-zabbix-server-0.1/createlinks	2020-05-13 22:18:11.840000000 -0400
+@@ -8,6 +8,8 @@
+ templates2events("/etc/httpd/conf/httpd.conf", $event);
+ templates2events("/etc/zabbix/zabbix_server.conf", qw(zabbix-server-update bootstrap-console-save));
+ templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save));
++# new path with zabbix 4.4.6
++templates2events("/etc/zabbix/web/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save));
+ templates2events("/etc/sudoers", $event);
+ templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
+ templates2events("/var/lib/zabbix/.sendxmpprc", $event);
+@@ -15,10 +17,11 @@
  templates2events("/etc/rc.d/init.d/masq", $event);
  
  # Services to restart
@@ -16,7 +25,7 @@ diff -Nur smeserver-zabbix-server-0.1.ol
  safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin");
 diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server
 --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server	2020-05-10 03:05:06.278000000 -0400
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server	2020-05-13 22:05:54.925000000 -0400
 @@ -0,0 +1,7 @@
 +#!/bin/bash
 +# restart mysql.init
@@ -26,10 +35,14 @@ diff -Nur smeserver-zabbix-server-0.1.ol
 +exit 0
 +
 diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server
---- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-10 01:38:01.438000000 -0400
-+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-10 02:48:12.255000000 -0400
-@@ -3,13 +3,8 @@
- my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix';
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 22:05:14.450000000 -0400
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 22:07:18.871000000 -0400
+@@ -1,27 +1,30 @@
+ {
+-my $db = ${'zabbix-server'}{'DbName'} || 'zabbix';
+-my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix';
++my $db = ${'zabbix-server'}{'DbName'} || 'zabbixdb';
++my $user = ${'zabbix-server'}{'DbUser'} || 'zabbixuser';
  my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
  
 -my $schema = `rpm -qd zabbix-server-mysql | grep schema | grep mysql`;
@@ -41,10 +54,21 @@ diff -Nur smeserver-zabbix-server-0.1.ol
 -
 +my $schema = `rpm -qd zabbix-server-mysql | grep create`;
 +chomp $schema;
++my $curcharset=`echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r  's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'`;
++chomp $curcharset;
  
  $OUT .= <<"END";
  #! /bin/sh
-@@ -18,10 +13,9 @@
+ if [ -d /var/lib/mysql/$db ]; then
+-	for P in \$(rpm -qd zabbix-server | grep dbpatch | grep mysql); do
++
++	# check if utf8
++        if [[ "$curcharset" != "utf8" ]] ;then
++                echo "ALTER DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" |/usr/bin/mysql
++                echo 'ALTER TABLE `$db`.`problem_tag` DROP INDEX `problem_tag_1`, ADD INDEX `problem_tag_1` (`eventid`, `tag` (100), `value`(100));' |mysql
++                mysql --batch --skip-column-names --execute 'select concat("alter table ",TABLE_SCHEMA,".",TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") from information_schema.TABLES where TABLE_SCHEMA="$db"' |mysql
++        fi
++	for P in \$(rpm -qd zabbix-server-mysql | grep dbpatch | grep mysql); do
  		/usr/bin/mysql $db < \$P
  	done
  else
@@ -59,8 +83,8 @@ diff -Nur smeserver-zabbix-server-0.1.ol
  
  /usr/bin/mysql <<EOF
 diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web
---- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web	2020-05-10 01:38:01.436000000 -0400
-+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web	2020-05-10 02:47:42.612000000 -0400
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web	2020-05-13 22:05:14.446000000 -0400
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web	2020-05-13 22:05:54.925000000 -0400
 @@ -24,6 +24,7 @@
      php_admin_value memory_limit 256M
      php_admin_value date.timezone $tz
@@ -69,33 +93,10 @@ diff -Nur smeserver-zabbix-server-0.1.ol
      AllowOverride None
      Order allow,deny
      Allow from $access
-diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server
---- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 12:16:30.203000000 -0400
-+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 21:13:00.912000000 -0400
-@@ -1,6 +1,6 @@
- {
--my $db = ${'zabbix-server'}{'DbName'} || 'zabbix';
--my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix';
-+my $db = ${'zabbix-server'}{'DbName'} || 'zabbixdb';
-+my $user = ${'zabbix-server'}{'DbUser'} || 'zabbixuser';
- my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
- 
- my $schema = `rpm -qd zabbix-server-mysql | grep create`;
-@@ -9,7 +9,16 @@
- $OUT .= <<"END";
- #! /bin/sh
- if [ -d /var/lib/mysql/$db ]; then
--	for P in \$(rpm -qd zabbix-server | grep dbpatch | grep mysql); do
+diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/zabbix/web/zabbix.conf.php smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/zabbix/web/zabbix.conf.php
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/zabbix/web/zabbix.conf.php	1969-12-31 19:00:00.000000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/zabbix/web/zabbix.conf.php	2020-05-13 22:15:54.659000000 -0400
+@@ -0,0 +1,3 @@
++TEMPLATE_PATH="/etc/zabbix/zabbix.conf.php"
++OUTPUT_FILENAME="/etc/zabbix/web/zabbix.conf.php"
 +
-+	# check if utf8
-+	my $curcharset=`echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r  's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'`;
-+	chomp $curcharset;
-+	if ( $curcharset ne "utf8" ) {
-+		echo "ALTER DATABASE DBNAME CHARACTER SET utf8 COLLATE utf8_bin;" |/usr/bin/mysql
-+		echo 'ALTER TABLE `'.$db.'`.`problem_tag` DROP INDEX `problem_tag_1`, ADD INDEX `problem_tag_1` (`eventid`, `tag` (100), `value`(100));' |mysql
-+ 		mysql --batch --skip-column-names --execute 'select concat("alter table ",TABLE_SCHEMA,".",TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") from information_schema.TABLES where TABLE_SCHEMA="'.$db.'"' |mysql
-+	}
-+	for P in \$(rpm -qd zabbix-server-mysql | grep dbpatch | grep mysql); do
- 		/usr/bin/mysql $db < \$P
- 	done
- else