/[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.3 by jpp, Tue Jun 1 17:04:29 2021 UTC Revision 1.6 by jpp, Tue Jun 1 17:29:33 2021 UTC
# Line 12  diff -Nur --no-dereference smeserver-php Line 12  diff -Nur --no-dereference smeserver-php
12  +         {  +         {
13  +             templates2events("/etc/httpd/conf/httpd.conf", $event);  +             templates2events("/etc/httpd/conf/httpd.conf", $event);
14  +             templates2events("/etc/phpldapadmin/config.php", $event);  +             templates2events("/etc/phpldapadmin/config.php", $event);
15  +             templates2events("/etc/opt/remi/php74/php-fpm.d/www.conf", $event);  +             templates2events("/etc/opt/remi/php____PHPVERSION____/php-fpm.d/www.conf", $event);
16  +             safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");  +             safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
17  +             safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm");  +             safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php____PHPVERSION____-php-fpm");
18  +         }  +         }
19    diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status
20    --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status     1969-12-31 19:00:00.000000000 -0500
21    +++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status 2021-06-01 13:08:02.020000000 -0400
22    @@ -0,0 +1 @@
23    +enabled
24  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin
25  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin        2014-06-21 12:53:47.000000000 -0400  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin        2014-06-21 12:53:47.000000000 -0400
26  +++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin    2021-06-01 13:04:03.628000000 -0400  +++ smeserver-phpldapadmin-1.5.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Phpldapadmin    2021-06-01 13:04:03.628000000 -0400
# Line 27  diff -Nur --no-dereference smeserver-php Line 32  diff -Nur --no-dereference smeserver-php
32  -    php_flag  magic_quotes_gpc  on  -    php_flag  magic_quotes_gpc  on
33  -    php_flag  track_vars        on  -    php_flag  track_vars        on
34  +    <FilesMatch \.php$>  +    <FilesMatch \.php$>
35  +        SetHandler "proxy:unix:/var/run/php-fpm/php74-phpldapadmin.sock|fcgi://localhost"  +        SetHandler "proxy:unix:/var/run/php-fpm/php____PHPVERSION____-phpldapadmin.sock|fcgi://localhost"
36  +    </FilesMatch>  +    </FilesMatch>
37  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
38  +  +
# Line 35  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  +  +
47  +if ($PHP_VERSION eq '74'){  +if ($PHP_VERSION eq '____PHPVERSION____'){
48  +  if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){  +  if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){
49  +    my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes  +    my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes
50  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
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 57  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