/[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.22 by jpp, Thu Jul 28 05:18:21 2022 UTC Revision 1.24 by jpp, Sat Jul 30 06:15:03 2022 UTC
# Line 496  diff -Nur --no-dereference smeserver-cac Line 496  diff -Nur --no-dereference smeserver-cac
496  +  if (($cacti{'status'} || 'disabled') eq 'enabled'){  +  if (($cacti{'status'} || 'disabled') eq 'enabled'){
497  +    my $max_upload_size = ($cacti{MaxUploadSize} || '4096');  +    my $max_upload_size = ($cacti{MaxUploadSize} || '4096');
498  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
499  +    my $memory_limit = ($cacti{MemoryLimit} || '5555500M');  +    my $memory_limit = ($cacti{MemoryLimit} || '500M');
500  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
501  +    my $open_basedir= $cacti{PHPBaseDir} || '';  +    my $open_basedir= $cacti{PHPBaseDir} || '';
502  +    $open_basedir = "/tmp/:/share/:/var/log/cacti:/etc/cacti/db.php:/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";  +    $open_basedir = "/tmp/:/share/:/var/log/cacti:/etc/cacti/db.php:/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";
# Line 584  diff -Nur --no-dereference smeserver-cac Line 584  diff -Nur --no-dereference smeserver-cac
584  +cd /usr/share/cacti/cli  +cd /usr/share/cacti/cli
585  +  +
586  +#install, we put away, it fails in the temp event in yum at first, so here is a dirty hack  +#install, we put away, it fails in the temp event in yum at first, so here is a dirty hack
587  +/usr/bin/php install_cacti.php >/dev/null 2>&1 &      +/usr/bin/php install_cacti.php &    
588  +pids=$!; sleep 3; kill -9 $pids;  +pids=$!; sleep 3; kill -9 $pids;
589  +/usr/bin/php install_cacti.php  --accept-eula --install  || exit 0  +/usr/bin/php install_cacti.php  --accept-eula --install  || exit 0
590  +  +

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