--- rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-z50.patch	2022/12/11 03:04:05	1.2
+++ rpms/smeserver-zabbix-server/contribs10/smeserver-zabbix-server-0.1-z50.patch	2022/12/11 07:04:10	1.3
@@ -155,8 +155,8 @@ diff -Nur --no-dereference smeserver-zab
 -}
 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 @@
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init105/80zabbix-server	2022-12-11 02:02:45.993000000 -0500
+@@ -0,0 +1,73 @@
 +{
 +my $db = ${'zabbix-server'}{'DbName'} || 'zabbixdb';
 +my $user = ${'zabbix-server'}{'DbUser'} || 'zabbixuser';
@@ -167,10 +167,12 @@ diff -Nur --no-dereference smeserver-zab
 +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';
-+
++$hashpass=`/usr/bin/htpasswd -bnBC 10 '' $adminpass | tr -d ':'`;
++$hashpass =~ tr/\r\n//d;
++$version = `/bin/ls -d /usr/share/doc/zabbix-web*|grep -Eo '[0-9.]+\$'|cut -d. -f1 || echo 4 `;
++$modpass=($version > 4)? "update users set passwd='$hashpass' where alias='Admin';": "#$version";
 +$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
@@ -190,6 +192,7 @@ diff -Nur --no-dereference smeserver-zab
 +/usr/bin/mysql105 <<EOF
 +USE $db;
 +update users set passwd=md5('$adminpass') where alias='Admin' and passwd=md5('zabbix');
++$modpass
 +EOF
 +
 +
@@ -227,18 +230,37 @@ diff -Nur --no-dereference smeserver-zab
 +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;
+diff -Nur --no-dereference smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20zabbix-server
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20zabbix-server	2022-12-10 02:37:45.009000000 -0500
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20zabbix-server	2022-12-11 00:10:00.668000000 -0500
+@@ -8,6 +8,8 @@
+     $disablefunctions = 'system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, ' . 
+             'escapeshellarg, escapeshellcmd';
+ 
++$socket = ( -d "/var/lib/mysql/zabbixdb") ? "/var/lib/mysql/mysql.sock" : "/var/lib/mysql/mariadb105.sock";
++
+     $OUT .=<<_EOF;
  
- $DB["TYPE"]             = "MYSQL";
--$DB["SERVER"]           = "localhost";
-+$DB["SERVER"]           = "{$OUT = ( -d "/var/lib/mysql/zabbixdb") ? "localhost" : "localhost:/var/lib/mysql/mariadb105.sock"}";
- $DB["PORT"]             = "0";
+ [php$PHP_VERSION-$id]
+@@ -38,14 +40,16 @@
+ php_admin_value[max_input_time] = 600
+ php_admin_value[post_max_size] = 32M
+ php_admin_value[upload_max_filesize] = 16M
+-php_admin_value[disable_functions] = $disablefunctions;
+-php_admin_value[open_basedir] = $openbasedir;
++php_admin_value[disable_functions] = $disablefunctions
++php_admin_value[open_basedir] = $openbasedir
+ php_admin_flag[allow_url_fopen] = on
+ php_admin_flag[file_upload] = off
+ php_admin_flag[session.cookie_httponly] = on
+ php_admin_flag[allow_url_include] = off
+ php_admin_value[session.save_handler] = files
+ php_admin_value[always_populate_raw_post_data] = -1
++php_value[mysqli.default_socket] = $socket
++php_value[mysql.default_socket] = $socket
  
- {
+ _EOF
+   }
 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