--- rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/27 19:12:45	1.5
+++ rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch	2022/07/28 03:24:09	1.12
@@ -1,164 +1,5 @@
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks
 --- smeserver-cacti-1.1.19.old/createlinks	2014-06-16 11:53:01.000000000 -0400
-+++ smeserver-cacti-1.1.19/createlinks	2022-07-26 00:15:21.267000000 -0400
-@@ -5,6 +5,7 @@
- for my $event (qw(
-     post-upgrade
-     bootstrap-console-save
-+    console-save
- 	))
- {
-     templates2events("/etc/cacti/db.php", $event);
-@@ -22,3 +23,26 @@
- }
- 
- templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");
-+
-+my $event="smeserver-cacti-update";
-+event_templates($event, qw(
-+  /etc/cacti/db.php
-+  /etc/httpd/conf/httpd.conf
-+  /etc/crontab
-+  /etc/opt/remi/php74/php-fpm.d/www.conf
-+  /etc/e-smith/sql/init/80cacti
-+));
-+
-+event_services($event, 
-+  'crond' => 'restart',
-+  'mysql.init' => 'restart',
-+  'httpd-e-smith' => 'sigusr1',
-+  'php74-php-fpm' => 'reload-or-restart'
-+);
-+
-+#backup ?
-+#use esmith::Build::Backup qw(:all);
-+#backup_includes("smeserver-cacti", qw(
-+#
-+#));
-+
-diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/db/configuration/migrate/80cacti smeserver-cacti-1.1.19/root/etc/e-smith/db/configuration/migrate/80cacti
---- smeserver-cacti-1.1.19.old/root/etc/e-smith/db/configuration/migrate/80cacti	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-cacti-1.1.19/root/etc/e-smith/db/configuration/migrate/80cacti	2022-07-26 00:51:52.311000000 -0400
-@@ -0,0 +1,45 @@
-+{
-+    use MIME::Base64 qw(encode_base64);
-+
-+    my $service;
-+    my $rec;
-+    my $pw;
-+
-+    # Store the cacti password in the configuration database (if not already there)
-+    $service = 'cacti';
-+
-+    $rec = $DB->get($service) || $DB->new_record($service, {type => 'service'});
-+
-+    $pw = $rec->prop('DbPassword');
-+    
-+
-+	if (! $pw)
-+    	{
-+		
-+		if ( open( RANDOM, "/dev/urandom" ) )
-+	    	{
-+        		my $buf;
-+		        # 57 bytes is a full line of Base64 coding, and contains
-+		        # 456 bits of randomness - given a perfectly random /dev/random
-+	       		if ( read( RANDOM, $buf, 57 ) != 57 )
-+	        	{
-+	        	    warn("Short read from /dev/random: $!");
-+	        	}
-+	        	else
-+	        	{
-+	            		$pw = encode_base64($buf);
-+	        	    chomp $pw;
-+	        	}
-+	        	close RANDOM;
-+	    	}
-+	    	else
-+	    	{
-+	    	    warn "Could not open /dev/urandom: $!";
-+	    	}
-+		
-+	    	$rec->set_prop('DbPassword', $pw);
-+	}
-+
-+
-+
-+}
-diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti
---- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti	2022-07-26 00:03:45.335000000 -0400
-@@ -0,0 +1,68 @@
-+{
-+
-+if ($PHP_VERSION eq '74'){
-+  if (($cacti{'status'} || 'disabled') eq 'enabled'){
-+    my $max_upload_size = ($cacti{MaxUploadSize} || '4096');
-+    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
-+    my $memory_limit = ($cacti{MemoryLimit} || '512M');
-+    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
-+    my $open_basedir= $cacti{PHPBaseDir} || '';
-+    $open_basedir = "/usr/share/cacti:/var/lib/cacti:/var/log/cacti.log:/var/lib/php/cacti:/home/e-smith/files/cacti:/dev/urandom:/proc/meminfo:$open_basedir";
-+    my $id = 'cacti';
-+    my $max_children = $cacti{'PHPmaxChildren'} || 20;
-+    my $min_spare_servers = $cacti{'PHPminServers'} || 4;
-+    my $start_servers = $cacti{'PHPstartServers'} || 6;
-+    my $max_spare_servers = $cacti{'PHPmaxServers'} || 8;
-+    my $max_requests = $cacti{'PHPmaxRequests'} || 1000;
-+    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
-+    $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 +  $min_spare_servers/2  ) : $start_servers;
-+
-+    $OUT .=<<_EOF;
-+
-+[php$PHP_VERSION-$id]
-+user = www
-+group = www
-+listen.owner = root
-+listen.group = www
-+listen.mode = 0660
-+listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock
-+pm = dynamic
-+pm.max_children = $max_children
-+pm.start_servers = $start_servers
-+pm.min_spare_servers = $min_spare_servers
-+pm.max_spare_servers = $max_spare_servers
-+pm.max_requests = $max_requests
-+php_admin_value[session.save_path] = /var/lib/php/$id/session
-+php_admin_value[session.gc_maxlifetime] = 86400
-+php_admin_value[opcache.file_cache]  = /var/lib/php/$id/opcache
-+php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp
-+php_admin_value[error_log] = /var/log/php/$id/error.log
-+slowlog = /var/log/php/cacti/slow.log
-+php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
-+php_admin_flag[display_errors] = off
-+php_admin_flag[log_errors] = on
-+php_admin_value[error_log] = syslog
-+php_admin_value[memory_limit] = $memory_limit
-+php_admin_value[max_execution_time] = 3600
-+php_admin_value[post_max_size] = $max_upload_size
-+php_admin_value[upload_max_filesize] = $max_upload_size
-+php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
-+php_admin_value[open_basedir] = $open_basedir
-+php_admin_flag[allow_url_fopen] = on
-+php_admin_flag[file_upload] = on
-+php_admin_flag[session.cookie_httponly] = on
-+php_admin_flag[allow_url_include] = off
-+php_admin_value[session.save_handler] = files
-+php_admin_flag[output_buffering] = off
-+
-+_EOF
-+
-+  }
-+  else{
-+    $OUT .= '; Nextcloud is disabled';
-+  }
-+}
-+}
-+
-+
-+
-diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks
---- smeserver-cacti-1.1.19.old/createlinks	2014-06-16 11:53:01.000000000 -0400
 +++ smeserver-cacti-1.1.19/createlinks	2022-07-27 14:55:50.939000000 -0400
 @@ -5,6 +5,7 @@
  for my $event (qw(
@@ -168,7 +9,7 @@ diff -Nur --no-dereference smeserver-cac
  	))
  {
      templates2events("/etc/cacti/db.php", $event);
-@@ -22,3 +23,32 @@
+@@ -22,3 +23,35 @@
  }
  
  templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");
@@ -178,6 +19,7 @@ diff -Nur --no-dereference smeserver-cac
 +  /etc/cacti/db.php
 +  /etc/httpd/conf/httpd.conf
 +  /etc/crontab
++  /etc/my.cnf
 +  /etc/opt/remi/php74/php-fpm.d/www.conf
 +  /etc/e-smith/sql/init/80cacti
 +));
@@ -185,12 +27,14 @@ diff -Nur --no-dereference smeserver-cac
 +event_services($event, 
 +  'crond' => 'restart',
 +  'mysql.init' => 'restart',
++  'mariadb' => 'restart',
 +  'httpd-e-smith' => 'sigusr1',
 +  'php74-php-fpm' => 'reload-or-restart'
 +);
 +
 +event_actions($event,
-+'cacti-conf' => '50',
++'cacti-conf' => '2',
++'cacti-install' => '94',
 +'cacti-ldap' => '95'
 +);
 +
@@ -295,7 +139,7 @@ diff -Nur --no-dereference smeserver-cac
 +#/sbin/e-smith/config getprop php74 MemoryLimit  1>/dev/null || ( config setprop  php74 MemoryLimit 800M ; echo "setting php74 memory_limit 800M" ; psomething=1)
 +# install detect cli for php not php74 even if $php_path is set
 +
-+[ $something == 1 ] && /usr/sbin/e-smith/expand-template /etc/my.cnf  && /usr/bin/systemctl restart mariadb.service
++#[ $something == 1 ] && /sbin/e-smith/expand-template /etc/my.cnf
 +#[ $psomething == 1 ] && /usr/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini && /usr/bin/systemctl restart php74-php-fpm.service 
 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	1969-12-31 19:00:00.000000000 -0500
@@ -583,7 +427,7 @@ diff -Nur --no-dereference smeserver-cac
      fi
      /usr/bin/mysql <<EOF
 -    CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-+    CREATE DATABASE $db DEFAULT CHARACTER SET utf8mb4 COLLATE utf8_unicode_ci;
++    CREATE DATABASE $db DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
      use $db;
      use mysql;
      GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
@@ -723,3 +567,75 @@ diff -Nur --no-dereference smeserver-cac
 +UID="root"
  GID="www"
  PERMS=0640
+diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/my.cnf/020cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/my.cnf/020cacti
+--- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/my.cnf/020cacti	1969-12-31 19:00:00.000000000 -0500
++++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/my.cnf/020cacti	2022-07-27 17:18:19.452000000 -0400
+@@ -0,0 +1,4 @@
++#for cacti use
++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  --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';