--- rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/28 03:24:09	1.12
+++ rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/28 04:20:19	1.17
@@ -577,15 +577,17 @@ diff -Nur --no-dereference smeserver-cac
 +innodb_flush_log_at_trx_commit=2
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-install smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-install
 --- smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-install	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-install	2022-07-27 23:05:44.866000000 -0400
-@@ -0,0 +1,15 @@
++++ smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-install	2022-07-28 00:00:45.319000000 -0400
+@@ -0,0 +1,17 @@
 +#!/bin/bash
 +
 +# move to cli dir
 +cd /usr/share/cacti/cli
 +
-+#install
-+/usr/bin/php74 install_cacti.php  --accept-eula --install  --path=php_binary:/usr/bin/php74
++#install, we put away, it seems that inside the event it just do not work
++/usr/bin/php74 install_cacti.php  --accept-eula --install   &
++pids=$! ; wait $pid;
++
 +
 +#TODO:
 +#--automationmode
@@ -596,15 +598,15 @@ diff -Nur --no-dereference smeserver-cac
 +
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-ldap smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-ldap
 --- smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-ldap	2022-07-27 22:43:12.847000000 -0400
-+++ smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-ldap	2022-07-27 23:05:44.637000000 -0400
-@@ -19,24 +19,25 @@
++++ smeserver-cacti-1.1.19/root/etc/e-smith/events/actions/cacti-ldap	2022-07-27 23:58:46.807000000 -0400
+@@ -19,24 +19,26 @@
  #ldap_group_require 	'on' or ''
  # then set our admin password
  /usr/bin/mysql <<EOF
 -UPDATE ${db}.settings SET value='memberUid' WHERE name='ldap_group_attrib';
 -UPDATE ${db}.settings SET value='uid=cactigroup,ou=Groups,$DN' WHERE name='ldap_group_dn';
-+INSERT INTO ${db}.settings VALUES ('ldap_group_attrib','memberUid') ON DUPLICATE KEY UPDATE name='ldap_group_attrib';
-+INSERT INTO ${db}.settings VALUES ('ldap_group_dn','uid=cactigroup,ou=Groups,$DN') ON DUPLICATE KEY UPDATE name='ldap_group_dn';
++REPLACE INTO ${db}.settings VALUES ('ldap_group_attrib','memberUid') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_group_dn','uid=cactigroup,ou=Groups,$DN') ;
  
 -UPDATE ${db}.settings SET value='0' WHERE name='ldap_tls_certificate';
 -UPDATE ${db}.settings SET value='3' WHERE name='ldap_version';
@@ -620,22 +622,23 @@ diff -Nur --no-dereference smeserver-cac
 -UPDATE ${db}.settings SET value='3' WHERE name='auth_method';
 -UPDATE ${db}.settings SET value='cn' WHERE name='cn_full_name';
 -UPDATE ${db}.settings SET value='mail' WHERE name='cn_email';
-+INSERT INTO ${db}.settings VALUES ('ldap_tls_certificate','0') ON DUPLICATE KEY UPDATE name='ldap_tls_certificate';
-+INSERT INTO ${db}.settings VALUES ('ldap_version','3') ON DUPLICATE KEY UPDATE name='ldap_version';
-+INSERT INTO ${db}.settings VALUES ('ldap_server','localhost') ON DUPLICATE KEY UPDATE name='ldap_server';
-+INSERT INTO ${db}.settings VALUES ('ldap_search_filter','objectClass=inetOrgPerson') ON DUPLICATE KEY UPDATE name='ldap_search_filter';
-+INSERT INTO ${db}.settings VALUES ('ldap_search_base','ou=Users,$DN') ON DUPLICATE KEY UPDATE name='ldap_search_base';
-+INSERT INTO ${db}.settings VALUES ('ldap_referrals','0') ON DUPLICATE KEY UPDATE name='ldap_referrals';
-+INSERT INTO ${db}.settings VALUES ('ldap_port_ssl','636') ON DUPLICATE KEY UPDATE name='ldap_port_ssl';
-+INSERT INTO ${db}.settings VALUES ('ldap_port','389') ON DUPLICATE KEY UPDATE name='ldap_port';
-+INSERT INTO ${db}.settings VALUES ('ldap_mode','0') ON DUPLICATE KEY UPDATE name='ldap_mode';
-+INSERT INTO ${db}.settings VALUES ('ldap_encryption','0') ON DUPLICATE KEY UPDATE name='ldap_encryption';
-+INSERT INTO ${db}.settings VALUES ('ldap_dn','uid=<username>,ou=Users,$DN') ON DUPLICATE KEY UPDATE name='ldap_dn';
-+INSERT INTO ${db}.settings VALUES ('auth_method','3') ON DUPLICATE KEY UPDATE name='auth_method';
-+INSERT INTO ${db}.settings VALUES ('cn_full_name','cn') ON DUPLICATE KEY UPDATE name='cn_full_name';
-+INSERT INTO ${db}.settings VALUES ('cn_email','mail') ON DUPLICATE KEY UPDATE name='cn_email';
++REPLACE INTO ${db}.settings VALUES ('ldap_tls_certificate','0') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_version','3') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_server','localhost') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_search_filter','objectClass=inetOrgPerson') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_search_base','ou=Users,$DN') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_referrals','0') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_port_ssl','636') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_port','389') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_mode','0') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_encryption','0') ;
++REPLACE INTO ${db}.settings VALUES ('ldap_dn','uid=<username>,ou=Users,$DN') ;
++REPLACE INTO ${db}.settings VALUES ('auth_method','3') ;
++REPLACE INTO ${db}.settings VALUES ('cn_full_name','cn') ;
++REPLACE INTO ${db}.settings VALUES ('cn_email','mail') ;
++REPLACE INTO ${db}.settings VALUES ('path_php_binary','/usr/bin/php74') ;
  
-+UPDATE ${db}.settings SET value='3' WHERE name='user_template' and value='0';
++REPLACE INTO ${db}.settings VALUES ('user_template','3');
  
  # set password of admin
  UPDATE ${db}.user_auth SET email_address='admin@${domain}', must_change_password='',password=md5('$adminpass'), enabled='on'  WHERE username='admin' and id='1';