/[smecontribs]/rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch
ViewVC logotype

Diff of /rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.6 by jpp, Wed Jul 27 19:14:34 2022 UTC Revision 1.9 by jpp, Wed Jul 27 21:43:39 2022 UTC
# Line 1  Line 1 
 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';  
 +  }  
 +}  
 +}  
 +  
 +  
 +  
1  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks
2  --- smeserver-cacti-1.1.19.old/createlinks      2014-06-16 11:53:01.000000000 -0400  --- smeserver-cacti-1.1.19.old/createlinks      2014-06-16 11:53:01.000000000 -0400
3  +++ smeserver-cacti-1.1.19/createlinks  2022-07-27 14:55:50.939000000 -0400  +++ smeserver-cacti-1.1.19/createlinks  2022-07-27 14:55:50.939000000 -0400
# Line 81  diff -Nur --no-dereference smeserver-cac Line 9  diff -Nur --no-dereference smeserver-cac
9          ))          ))
10   {   {
11       templates2events("/etc/cacti/db.php", $event);       templates2events("/etc/cacti/db.php", $event);
12  @@ -22,3 +23,32 @@  @@ -22,3 +23,34 @@
13   }   }
14    
15   templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");   templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");
# Line 91  diff -Nur --no-dereference smeserver-cac Line 19  diff -Nur --no-dereference smeserver-cac
19  +  /etc/cacti/db.php  +  /etc/cacti/db.php
20  +  /etc/httpd/conf/httpd.conf  +  /etc/httpd/conf/httpd.conf
21  +  /etc/crontab  +  /etc/crontab
22    +  /etc/my.cnf
23  +  /etc/opt/remi/php74/php-fpm.d/www.conf  +  /etc/opt/remi/php74/php-fpm.d/www.conf
24  +  /etc/e-smith/sql/init/80cacti  +  /etc/e-smith/sql/init/80cacti
25  +));  +));
# Line 98  diff -Nur --no-dereference smeserver-cac Line 27  diff -Nur --no-dereference smeserver-cac
27  +event_services($event,  +event_services($event,
28  +  'crond' => 'restart',  +  'crond' => 'restart',
29  +  'mysql.init' => 'restart',  +  'mysql.init' => 'restart',
30    +  'mariadb' => 'restart',
31  +  'httpd-e-smith' => 'sigusr1',  +  'httpd-e-smith' => 'sigusr1',
32  +  'php74-php-fpm' => 'reload-or-restart'  +  'php74-php-fpm' => 'reload-or-restart'
33  +);  +);
34  +  +
35  +event_actions($event,  +event_actions($event,
36  +'cacti-conf' => '50',  +'cacti-conf' => '2',
37  +'cacti-ldap' => '95'  +'cacti-ldap' => '95'
38  +);  +);
39  +  +
# Line 208  diff -Nur --no-dereference smeserver-cac Line 138  diff -Nur --no-dereference smeserver-cac
138  +#/sbin/e-smith/config getprop php74 MemoryLimit  1>/dev/null || ( config setprop  php74 MemoryLimit 800M ; echo "setting php74 memory_limit 800M" ; psomething=1)  +#/sbin/e-smith/config getprop php74 MemoryLimit  1>/dev/null || ( config setprop  php74 MemoryLimit 800M ; echo "setting php74 memory_limit 800M" ; psomething=1)
139  +# install detect cli for php not php74 even if $php_path is set  +# install detect cli for php not php74 even if $php_path is set
140  +  +
141  +[ $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
142  +#[ $psomething == 1 ] && /usr/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini && /usr/bin/systemctl restart php74-php-fpm.service  +#[ $psomething == 1 ] && /usr/sbin/e-smith/expand-template /etc/opt/remi/php74/php.ini && /usr/bin/systemctl restart php74-php-fpm.service
143  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  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
144  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-ldap       1969-12-31 19:00:00.000000000 -0500  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/events/actions/cacti-ldap       1969-12-31 19:00:00.000000000 -0500
# Line 496  diff -Nur --no-dereference smeserver-cac Line 426  diff -Nur --no-dereference smeserver-cac
426       fi       fi
427       /usr/bin/mysql <<EOF       /usr/bin/mysql <<EOF
428  -    CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;  -    CREATE DATABASE $db DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
429  +    CREATE DATABASE $db DEFAULT CHARACTER SET utf8mb4 COLLATE utf8_unicode_ci;  +    CREATE DATABASE $db DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
430       use $db;       use $db;
431       use mysql;       use mysql;
432       GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost       GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost
# Line 636  diff -Nur --no-dereference smeserver-cac Line 566  diff -Nur --no-dereference smeserver-cac
566  +UID="root"  +UID="root"
567   GID="www"   GID="www"
568   PERMS=0640   PERMS=0640
569    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
570    --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/my.cnf/020cacti   1969-12-31 19:00:00.000000000 -0500
571    +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/my.cnf/020cacti       2022-07-27 17:18:19.452000000 -0400
572    @@ -0,0 +1,4 @@
573    +#for cacti use
574    +innodb_buffer_pool_size=483M
575    +innodb_additional_mem_pool_size=80M
576    +innodb_flush_log_at_trx_commit=2

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed