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

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

Parent Directory | 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.7 by jpp,
Wed Jul 27 19:20:56 2022 UTC
 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';
- +  }
- +}
- +}
- +
- +
- +
  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

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1