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 @@
 templates2events("/etc/rc.d/init.d/masq", $event);
 
 # Services to restart
-safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
+#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
 safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-server");
 safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq");
+safe_symlink("/etc/e-smith/events/actions/zabbix-server","root/etc/e-smith/events/$event/50zabbix-server");
 
 # PHP header and footer
 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
@@ -0,0 +1,7 @@
+#!/bin/bash
+# restart mysql.init
+/sbin/service zabbix-server stop    1>/dev/null
+/sbin/service mysql.init restart 1>/dev/null
+/sbin/service zabbix-server start   1>/dev/null
+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';
 my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
 
-my $schema = `rpm -qd zabbix-server-mysql | grep schema | grep mysql`;
-$schema = `rpm -qd zabbix-server | grep schema | grep mysql` if $schema eq '';
-my $data = `rpm -qd zabbix-server-mysql | grep data.sql`;
-$data = `rpm -qd zabbix-server| grep mysql | grep data.sql` if $data eq '';
-my $images = `rpm -qd zabbix-server-mysql | grep images_mysql`;
-$images = `rpm -qd zabbix-server | grep mysql |grep images` if $images eq '';
-
+my $schema = `rpm -qd zabbix-server-mysql | grep create`;
+chomp $schema;
 
 $OUT .= <<"END";
 #! /bin/sh
@@ -18,10 +13,9 @@
 		/usr/bin/mysql $db < \$P
 	done
 else
-	/usr/bin/mysqladmin create $db
-	/usr/bin/mysql $db < $schema
-	/usr/bin/mysql $db < $data
-	/usr/bin/mysql $db < $images
+	echo "CREATE DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" | /usr/bin/mysql
+	/usr/bin/gunzip < $schema |     /usr/bin/mysql $db
+
 fi
 
 /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
@@ -24,6 +24,7 @@
     php_admin_value memory_limit 256M
     php_admin_value date.timezone $tz
     php_admin_value post_max_size 32M
+    php_admin_value always_populate_raw_post_data -1
     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
+
+	# 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