--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-z50.patch	2022/12/11 01:45:54	1.1
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-z50.patch	2022/12/11 03:04:05	1.2
@@ -1,11 +1,264 @@
 diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks
 --- smeserver-zabbix-server-0.1.old/createlinks	2022-12-10 02:37:45.031000000 -0500
-+++ smeserver-zabbix-server-0.1/createlinks	2022-12-10 20:44:05.704000000 -0500
-@@ -40,6 +40,7 @@
++++ smeserver-zabbix-server-0.1/createlinks	2022-12-10 21:14:41.987000000 -0500
+@@ -15,7 +15,7 @@
+ templates2events("/etc/sudoers", $event);
+ templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
+ templates2events("/var/lib/zabbix/.sendxmpprc", $event);
+-templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-server-update bootstrap-console-save));
++templates2events("/etc/e-smith/sql/init105/80zabbix-server", qw(zabbix-server-update bootstrap-console-save));
+ templates2events("/etc/rc.d/init.d/masq", $event);
+ 
+ # Services to restart
+@@ -40,10 +40,11 @@
  #Systemd start stop
  # rpm update action (invoked by yum on install and update
  $contrib = "smeserver-zabbix-server";
 +safe_symlink("/etc/e-smith/events/$contrib-update", "root/etc/e-smith/events/$contrib-z50-update");
  event_actions("$contrib-update", qw(
-   systemd-default 10
-   systemd-reload 12
+-  systemd-default 10
+-  systemd-reload 12
+-  zabbix-server 50
++  systemd-default 88
++  systemd-reload 89
++  zabbix-server 92
+ ));
+ 
+ event_templates("$contrib-update", qw(
+@@ -51,7 +52,7 @@
+   /etc/crontab
+   /etc/rc.d/init.d/masq
+   /etc/sudoers
+-  /etc/e-smith/sql/init/80zabbix-server
++  /etc/e-smith/sql/init105/80zabbix-server
+   /etc/zabbix/zabbix.conf.php
+   /etc/zabbix/web/zabbix.conf.php
+   /var/lib/zabbix/bin/sendxmpp
+@@ -67,6 +68,8 @@
+   httpd-e-smith sigusr1
+   php74-php-fpm  reload
+   masq		 adjust
+-  zabbix-server restart
+ ));
+ 
++#zabbix server 92 will stop zabbix, restart mariadb105-mysql.init and start zabbix
++#that is why those services are not listed in event_service. order matter.
++#also this is at the end to be sure that mariadb105 is installed and running
+diff -Nur --no-dereference 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	2022-12-10 02:37:44.990000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server	2022-12-10 21:12:05.409000000 -0500
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ # restart mysql.init
+ /usr/bin/systemctl stop zabbix-server  1>/dev/null
+-/usr/bin/systemctl restart mysql.init  1>/dev/null
++/usr/bin/systemctl restart mariadb105-mysql.init  1>/dev/null
+ /usr/bin/systemctl start zabbix-server 1>/dev/null
+ exit 0
+ 
+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	2022-12-10 02:37:45.025000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	1969-12-31 19:00:00.000000000 -0500
+@@ -1,93 +0,0 @@
+-{
+-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`;
+-chomp $schema;
+-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;
+-my $adminpass= ${'zabbix-server'}{'AdminPassword'} || 'zabbix';
+-
+-$OUT .= <<"END";
+-#! /bin/sh
+-if [ -d /var/lib/mysql/$db ]; then
+-
+-	# 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
+-	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
+-USE $db;
+-update users set passwd=md5('$adminpass') where alias='Admin' and passwd=md5('zabbix');
+-EOF
+-
+-
+-/usr/bin/mysql <<EOF
+-USE mysql;
+-
+-REPLACE INTO user (
+-                     host,
+-                     user,
+-                     password)
+-            VALUES (
+-                     'localhost',
+-                     '${'zabbix-server'}{DbUser}',
+-                     PASSWORD ('${'zabbix-server'}{DbPassword}'));
+-
+-
+-REPLACE INTO db (
+-                   host,
+-                   db,
+-                   user,
+-                   select_priv, insert_priv, update_priv, delete_priv,
+-                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
+-                   grant_priv, lock_tables_priv, references_priv) 
+-          VALUES (
+-                   'localhost',
+-                   '${'zabbix-server'}{DbName}',
+-                   '${'zabbix-server'}{DbUser}',
+-                   'Y', 'Y', 'Y', 'Y',
+-                   'Y', 'Y', 'Y', 'Y', 'Y',
+-                   'N', 'Y', 'Y');
+-
+-FLUSH PRIVILEGES;
+-
+-USE ${'zabbix-server'}{DbName};
+-
+-INSERT IGNORE INTO media_type (
+-		mediatypeid,
+-		type, description,
+-		smtp_server,
+-		smtp_helo,
+-		smtp_email,
+-		exec_path,
+-		gsm_modem,
+-		username,
+-		passwd) 
+-	VALUES(
+-		4,
+-		1,
+-		'xmpp',
+-		'',
+-		'',
+-		'',
+-		'sendxmpp',
+-		'',
+-		'',
+-		'');
+-
+-EOF
+-END
+-}
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init105/80zabbix-server
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/80zabbix-server	1969-12-31 19:00:00.000000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init105/80zabbix-server	2022-12-10 21:48:11.872000000 -0500
+@@ -0,0 +1,70 @@
++{
++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`;
++chomp $schema;
++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;
++my $adminpass= ${'zabbix-server'}{'AdminPassword'} || 'zabbix';
++
++$OUT .= <<"END";
++#! /bin/sh
++#if [ -d /var/lib/mysql/$db ]; then
++if [ -d /var/opt/rh/rh-mariadb105/lib/mysql/$db ]; then
++	# check if utf8
++        if [[ "$curcharset" != "utf8" ]] ;then
++                echo "ALTER DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" |/usr/bin/mysql105
++                echo 'ALTER TABLE `$db`.`problem_tag` DROP INDEX `problem_tag_1`, ADD INDEX `problem_tag_1` (`eventid`, `tag` (100), `value`(100));' |/usr/bin/mysql105
++                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"' | /usr/bin/mysql105
++        fi
++	for P in \$(rpm -qd zabbix-server-mysql | grep dbpatch | grep mysql); do
++		/usr/bin/mysql105 $db < \$P
++	done
++else
++	echo "CREATE DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" | /usr/bin/mysql105
++	/usr/bin/gunzip < $schema |     /usr/bin/mysql105 $db
++
++fi
++
++/usr/bin/mysql105 <<EOF
++USE $db;
++update users set passwd=md5('$adminpass') where alias='Admin' and passwd=md5('zabbix');
++EOF
++
++
++/usr/bin/mysql105 <<EOF
++USE mysql;
++
++grant all on $db.* to '${'zabbix-server'}{DbUser}'\@'localhost' identified by '${'zabbix-server'}{DbPassword}';
++
++FLUSH PRIVILEGES;
++
++USE ${'zabbix-server'}{DbName};
++
++INSERT IGNORE INTO media_type (
++		mediatypeid,
++		type, description,
++		smtp_server,
++		smtp_helo,
++		smtp_email,
++		exec_path,
++		gsm_modem,
++		username,
++		passwd) 
++	VALUES(
++		4,
++		1,
++		'xmpp',
++		'',
++		'',
++		'',
++		'sendxmpp',
++		'',
++		'',
++		'');
++
++EOF
++END
++}
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database	2009-02-02 22:01:01.000000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database	2022-12-10 22:03:00.362000000 -0500
+@@ -1,7 +1,7 @@
+ global $DB;
+ 
+ $DB["TYPE"]             = "MYSQL";
+-$DB["SERVER"]           = "localhost";
++$DB["SERVER"]           = "{$OUT = ( -d "/var/lib/mysql/zabbixdb") ? "localhost" : "localhost:/var/lib/mysql/mariadb105.sock"}";
+ $DB["PORT"]             = "0";
+ 
+ {
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database	2022-12-10 02:37:44.939000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database	2022-12-10 21:28:53.268000000 -0500
+@@ -28,7 +28,8 @@
+ 
+ # Connect to MySQL using Unix socket?
+ 
+-DBSocket=/var/lib/mysql/mysql.sock
++#DBSocket=/var/lib/mysql/mysql.sock
++DBSocket=/var/lib/mysql/{$OUT = ( -d "/var/lib/mysql/zabbixdb") ? "mysql" : "mariadb105"}.sock
+ 
+ # Enable database cache module
+ StartDBSyncers=1
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server	2009-02-02 17:40:29.000000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server	1969-12-31 19:00:00.000000000 -0500
+@@ -1 +0,0 @@
+-PERMS=0750
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/80zabbix-server
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/80zabbix-server	1969-12-31 19:00:00.000000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/80zabbix-server	2009-02-02 17:40:29.000000000 -0500
+@@ -0,0 +1 @@
++PERMS=0750