smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-bz11232-installSME10.patch

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,14 @@
 $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/e-smith/sql/init/80zabbix-server
   /etc/zabbix/zabbix_server.conf
   /usr/share/zabbix/.user.ini
   /etc/systemd/system-preset/49-koozali.preset
@@ -57,6 +60,6 @@
 event_services("$contrib-update", qw(
   httpd-e-smith sigusr1
   php74-php-fpm  reload
-  zabbix-server start
+  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 22:48:03.407000000 -0500
+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2021-11-07 22:49:14.498000000 -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";
1	jpp	1.1	diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
2			--- smeserver-zabbix-server-0.1.old/createlinks 2021-11-07 01:08:44.157000000 -0500
3			+++ smeserver-zabbix-server-0.1/createlinks 2021-11-07 01:41:41.185000000 -0500
4	jpp	1.2	@@ -42,11 +42,14 @@
5	jpp	1.1	$contrib = "smeserver-zabbix-server";
6			event_actions("$contrib-update", qw(
7			systemd-default 10
8	jpp	1.2	+ systemd-reload 12
9	jpp	1.1	+ zabbix-server 50
10			));
11
12			event_templates("$contrib-update", qw(
13			/etc/httpd/conf/httpd.conf
14			/etc/crontab
15			+ /etc/e-smith/sql/init/80zabbix-server
16			/etc/zabbix/zabbix_server.conf
17			/usr/share/zabbix/.user.ini
18			/etc/systemd/system-preset/49-koozali.preset
19	jpp	1.2	@@ -57,6 +60,6 @@
20	jpp	1.1	event_services("$contrib-update", qw(
21			httpd-e-smith sigusr1
22			php74-php-fpm reload
23			- zabbix-server start
24			+ zabbix-server restart
25			));
26
27	jpp	1.2	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
28			--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2021-11-07 22:48:03.407000000 -0500
29			+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2021-11-07 22:49:14.498000000 -0500
30			@@ -5,7 +5,7 @@
31
32			my $schema = `rpm -qd zabbix-server-mysql \| grep create`;
33			chomp $schema;
34			-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/'`;
35			+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";
36			chomp $curcharset;
37
38			$OUT .= <<"END";