--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz11232-installSME10.patch	2021/11/07 06:43:24	1.1
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz11232-installSME10.patch	2021/11/08 04:26:19	1.5
@@ -1,25 +1,44 @@
 diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
---- smeserver-zabbix-server-0.1.old/createlinks	2021-11-07 01:08:44.157000000 -0500
-+++ smeserver-zabbix-server-0.1/createlinks	2021-11-07 01:41:41.185000000 -0500
-@@ -42,11 +42,13 @@
+--- smeserver-zabbix-server-0.1.old/createlinks	2021-11-07 23:22:58.003000000 -0500
++++ smeserver-zabbix-server-0.1/createlinks	2021-11-07 23:24:36.079000000 -0500
+@@ -42,11 +42,19 @@
  $contrib = "smeserver-zabbix-server";
  event_actions("$contrib-update", qw(
    systemd-default 10
++  systemd-reload 12
 +  zabbix-server 50
  ));
  
  event_templates("$contrib-update", qw(
    /etc/httpd/conf/httpd.conf
    /etc/crontab
++  /etc/rc.d/init.d/masq
++  /etc/sudoers
 +  /etc/e-smith/sql/init/80zabbix-server
++  /etc/zabbix/zabbix.conf.php
++  /etc/zabbix/web/zabbix.conf.php
++  /var/lib/zabbix/bin/sendxmpp
    /etc/zabbix/zabbix_server.conf
    /usr/share/zabbix/.user.ini
    /etc/systemd/system-preset/49-koozali.preset
-@@ -57,6 +59,6 @@
+@@ -57,6 +65,7 @@
  event_services("$contrib-update", qw(
    httpd-e-smith sigusr1
    php74-php-fpm  reload
 -  zabbix-server start
++  masq		 adjust
 +  zabbix-server restart
  ));
  
+diff -Nur --no-dereference 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	2021-11-07 23:22:57.960000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2021-11-07 23:24:59.971000000 -0500
+@@ -5,7 +5,7 @@
+ 
+ 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/'`;
++my $curcharset=  ( -d "/var/lib/mysql/$db" ) ? `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/'` : "utf8";
+ chomp $curcharset;
+ 
+ $OUT .= <<"END";