--- rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/27 21:43:39	1.9
+++ rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/28 03:10:31	1.11
@@ -9,7 +9,7 @@ diff -Nur --no-dereference smeserver-cac
  	))
  {
      templates2events("/etc/cacti/db.php", $event);
-@@ -22,3 +23,34 @@
+@@ -22,3 +23,35 @@
  }
  
  templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");
@@ -34,6 +34,7 @@ diff -Nur --no-dereference smeserver-cac
 +
 +event_actions($event,
 +'cacti-conf' => '2',
++'cacti-install' => '94',
 +'cacti-ldap' => '95'
 +);
 +
@@ -574,3 +575,67 @@ diff -Nur --no-dereference smeserver-cac
 +innodb_buffer_pool_size=483M
 +innodb_additional_mem_pool_size=80M
 +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 @@
++#!/bin/bash
++
++# move to cli dir
++cd /usr/share/cacti/cli
++
++#install
++/usr/bin/php74 install_cacti.php  --accept-eula --install  -m --path=php_binary:/usr/bin/php74
++
++#TODO:
++#--automationmode
++#--automationrange with LAN if server-gateway; or only interface if server only
++#--lang (using an array between cacti option and system language)
++# using this to set ldap ? --ldap:dn:...
++# do we need a --mode=upgrade and a --mode=install 
++
+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 @@
+ #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';
+ 
+-UPDATE ${db}.settings SET value='0' WHERE name='ldap_tls_certificate';
+-UPDATE ${db}.settings SET value='3' WHERE name='ldap_version';
+-UPDATE ${db}.settings SET value='localhost' WHERE name='ldap_server';
+-UPDATE ${db}.settings SET value='objectClass=inetOrgPerson' WHERE name='ldap_search_filter';
+-UPDATE ${db}.settings SET value='ou=Users,$DN' WHERE name='ldap_search_base';
+-UPDATE ${db}.settings SET value='0' WHERE name='ldap_referrals';
+-UPDATE ${db}.settings SET value='636' WHERE name='ldap_port_ssl';
+-UPDATE ${db}.settings SET value='389' WHERE name='ldap_port';
+-UPDATE ${db}.settings SET value='0' WHERE name='ldap_mode';
+-UPDATE ${db}.settings SET value='0' WHERE name='ldap_encryption';
+-UPDATE ${db}.settings SET value='uid=<username>,ou=Users,$DN' WHERE name='ldap_dn';
+-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';
+ 
++UPDATE ${db}.settings SET value='3' WHERE name='user_template' and value='0';
+ 
+ # 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';