/[smecontribs]/rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch
ViewVC logotype

Diff of /rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch

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

Revision 1.4 by jpp, Tue Jun 1 17:08:30 2021 UTC Revision 1.5 by jpp, Tue Jun 1 17:15:32 2021 UTC
# Line 40  diff -Nur --no-dereference smeserver-php Line 40  diff -Nur --no-dereference smeserver-php
40    
41  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin
42  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin   1969-12-31 19:00:00.000000000 -0500  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin   1969-12-31 19:00:00.000000000 -0500
43  +++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin       2021-06-01 12:42:13.346000000 -0400  +++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpldapadmin       2021-06-01 13:10:34.241000000 -0400
44  @@ -0,0 +1,73 @@  @@ -0,0 +1,73 @@
45  +{  +{
46  +  +
# Line 51  diff -Nur --no-dereference smeserver-php Line 51  diff -Nur --no-dereference smeserver-php
51  +    my $memory_limit = ($phpldapadmin{MemoryLimit} || '512M');  +    my $memory_limit = ($phpldapadmin{MemoryLimit} || '512M');
52  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
53  +    my $open_basedir= $phpldapadmin{PHPBaseDir} || '';  +    my $open_basedir= $phpldapadmin{PHPBaseDir} || '';
54  +    $open_basedir = "/etc/phpMyAdmin/:/usr/share/phpldapadmin/:/var/lib/php/phpldapadmin:".  +    $open_basedir = "/etc/phpldapadmin/:/usr/share/phpldapadmin/:/var/lib/php/phpldapadmin:".
55  +"/var/lib/phpldapadmin/temp:/var/lib/phpldapadmin/save/:/var/lib/phpldapadmin/upload:/var/lib/phpldapadmin/cache/:".  +"/var/lib/phpldapadmin/temp:/var/lib/phpldapadmin/save/:/var/lib/phpldapadmin/upload:/var/lib/phpldapadmin/cache/:".
56  +"/usr/share/php/:".  +"/usr/share/php/:".
57  +"/var/log/php/phpldapadmin::/dev/urandom:$open_basedir";  +"/var/log/php/phpldapadmin::/dev/urandom:$open_basedir";
# Line 62  diff -Nur --no-dereference smeserver-php Line 62  diff -Nur --no-dereference smeserver-php
62  +    my $max_requests = $phpldapadmin{'PHPmaxRequests'} || 1000;  +    my $max_requests = $phpldapadmin{'PHPmaxRequests'} || 1000;
63  +    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;  +    $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers;
64  +    $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 +  $min_spare_servers/2  ) : $start_servers;  +    $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 +  $min_spare_servers/2  ) : $start_servers;
65  +    my $id = 'phpldapadmin'; # Note the package is phpMyAdmin  +    my $id = 'phpldapadmin'; # Note the package is phpldapadmin
66  +    $OUT .=<<"_EOF";  +    $OUT .=<<"_EOF";
67  +  +
68  +[php$PHP_VERSION-$id]  +[php$PHP_VERSION-$id]

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