/[smecontribs]/rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch
ViewVC logotype

Diff of /rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch

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

Revision 1.2 by jcrisp, Tue Dec 22 13:51:37 2020 UTC Revision 1.3 by jpp, Sun Feb 28 03:30:17 2021 UTC
# Line 1  Line 1 
1  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
2  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias    2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias    2020-12-18 12:50:59.934881670 +0100
3  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias        2020-12-22 14:43:20.167546078 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias        2020-12-18 13:15:41.857953186 +0100
4  @@ -1,14 +1,15 @@  @@ -1,14 +1,14 @@
 +# 86PhpmyadminAlias Start  
5   {   {
6  -# phpmyadmin   # phpmyadmin
 +  
7     my $status = $phpmyadmin{'status'} || 'disabled';     my $status = $phpmyadmin{'status'} || 'disabled';
8  -  -
9  +  +
# Line 20  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 18  diff -ruN smeserver-phpmyadmin-4.0.10.2.
18     my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');     my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
19     my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');     my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled');
20       if (("$adminaccess" eq "enabled") || ("$multiaccess" eq "enabled"))       if (("$adminaccess" eq "enabled") || ("$multiaccess" eq "enabled"))
 @@ -29,7 +30,6 @@  
        $OUT .= "# phpMyAdmin Multiuser access disabled\n";  
      }  
   
 -  
      $OUT .= qq(  
  <Location /phpmyadmin>  
      AuthName "phpmyadmin"  
 @@ -41,6 +41,7 @@  
   
      $OUT .= qq(  
  <Directory /usr/share/phpMyAdmin>  
 +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1  
      SSLRequireSSL  
      Options -Indexes  
      AllowOverride None  
 @@ -48,7 +49,6 @@  
      deny from all  
      );  
   
 -  
    my $access = ($phpmyadmin{'access'} || 'private');  
   
      if ("$access" eq "private")  
21  @@ -60,27 +60,16 @@  @@ -60,27 +60,16 @@
22         $OUT .= "allow from all";         $OUT .= "allow from all";
23       }       }
# Line 74  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 48  diff -ruN smeserver-phpmyadmin-4.0.10.2.
48   </Directory>   </Directory>
49    
50    
 @@ -118,4 +107,4 @@  
        $OUT .= "# phpmyadmin is disabled";  
      }  
  }  
 -  
 +# 86PhpmyadminAlias End  
51  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias
52  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias       2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias       2020-12-18 12:50:59.934881670 +0100
53  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias   2020-12-22 14:43:33.375754951 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias   2020-12-18 13:18:08.739170876 +0100
54  @@ -1,7 +1,8 @@  @@ -1,7 +1,11 @@
55  +# 30phpmyadmin start  +#
56    +# 30phpmyadmin
57    +#
58    +
59   {   {
60       $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';       $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
61  -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');  -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled');
# Line 94  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 65  diff -ruN smeserver-phpmyadmin-4.0.10.2.
65    
66       if (($port eq "80") && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))       if (($port eq "80") && ($haveSSL eq 'yes')  && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled"))
67           {           {
 @@ -14,4 +15,4 @@  
              $OUT .= "    RewriteRule ^/phpmyadmin-multi(/.*|\$)    https://%{HTTP_HOST}/phpmyadmin-multi\$1 [L,R]\n";  
          }  
  }  
 -  
 +# 30phpmyadmin end  
68  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin
69  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin    1970-01-01 01:00:00.000000000 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin    1970-01-01 01:00:00.000000000 +0100
70  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin        2020-12-22 14:11:13.590207009 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin        2020-12-18 14:06:57.286829270 +0100
71  @@ -0,0 +1,74 @@  @@ -0,0 +1,69 @@
72  +{  +{
73  +  +
74  +if ($PHP_VERSION eq '73'){  +if ($PHP_VERSION eq '74'){
75  +  if (($phpmyadmin{'status'} || 'disabled') eq 'enabled'){  +  if (($phpmyadmin{'status'} || 'disabled') eq 'enabled'){
76  +    my $max_upload_size = ($phpmyadmin{MaxUploadSize} || '100M');# 104857600 bytes  +    my $max_upload_size = ($phpmyadmin{MaxUploadSize} || '100M');# 104857600 bytes
77  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);
78  +    my $memory_limit = ($phpmyadmin{MemoryLimit} || '512M');  +    my $memory_limit = ($phpmyadmin{MemoryLimit} || '512M');
79  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);  +    $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
80  +    my $open_basedir= $phpmyadmin{PHPBaseDir} || '';  +    my $open_basedir= $phpmyadmin{PHPBaseDir} || '';
81  +    $open_basedir = "/etc/phpMyAdmin:/usr/share/phpMyAdmin:/usr/share/phpMyAdmin/doc/html:/usr/share/php:/var/lib/php/phpmyadmin:/var/log/phpmyadmin:/dev/urandom:/proc/meminfo:$open_basedir";  +    $open_basedir = "/usr/share/phpMyAdmin:/var/lib/php/phpmyadmin:/var/log/phpmyadmin:/dev/urandom:/proc/meminfo:$open_basedir";
82  +    my $max_children = $phpmyadmin{'PHPmaxChildren'} || 20;  +    my $max_children = $phpmyadmin{'PHPmaxChildren'} || 20;
83  +    my $min_spare_servers = $phpmyadmin{'PHPminServers'} || 4;  +    my $min_spare_servers = $phpmyadmin{'PHPminServers'} || 4;
84  +    my $start_servers = $phpmyadmin{'PHPstartServers'} || 6;  +    my $start_servers = $phpmyadmin{'PHPstartServers'} || 6;
# Line 137  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 102  diff -ruN smeserver-phpmyadmin-4.0.10.2.
102  +pm.min_spare_servers = $min_spare_servers  +pm.min_spare_servers = $min_spare_servers
103  +pm.max_spare_servers = $max_spare_servers  +pm.max_spare_servers = $max_spare_servers
104  +pm.max_requests = $max_requests  +pm.max_requests = $max_requests
105  +; Used in nextcloud  +# Used in nextcloud
106  +;php_admin_value[session.save_path] = /var/lib/php/$id/session  +#php_admin_value[session.save_path] = /var/lib/php/$id/session
107  +; Deprecated  +php_admin_value[session.gc_maxlifetime] = 86400
108  +;php_admin_value[session.gc_maxlifetime] = 86400  +# Used in nextcloud
109  +; Used in nextcloud  +#php_admin_value[opcache.file_cache]  = /var/lib/php/$id/opcache
110  +;php_admin_value[opcache.file_cache]  = /var/lib/php/$id/opcache  +# Note the cpaitalisation here - can't use $id
 +; Note the capitalisation here - can't use $id  
111  +php_admin_value[upload_tmp_dir] = /var/lib/php/phpMyAdmin/tmp  +php_admin_value[upload_tmp_dir] = /var/lib/php/phpMyAdmin/tmp
112  +php_admin_value[error_log] = /var/log/php/$id/error.log  +php_admin_value[error_log] = /var/log/php/$id/error.log
113  +; Is slowlog needed?  +# Is slowlog needed?
114  +; slowlog = /var/log/php/phpmyadmin/slow.log  +# slowlog = /var/log/php/phpmyadmin/slow.log
115  +php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }  +php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
116  +php_admin_flag[display_errors] = off  +php_admin_flag[display_errors] = off
117  +php_admin_flag[log_errors] = on  +php_admin_flag[log_errors] = on
# Line 165  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 129  diff -ruN smeserver-phpmyadmin-4.0.10.2.
129  +php_admin_value[session.save_handler] = files  +php_admin_value[session.save_handler] = files
130  +php_admin_flag[output_buffering] = off  +php_admin_flag[output_buffering] = off
131  +  +
 +; For HTTP AUTH  
 +; disabled for now  
 +;php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php  
 +  
132  +_EOF  +_EOF
133  +  +
134  +  }  +  }
# Line 180  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 140  diff -ruN smeserver-phpmyadmin-4.0.10.2.
140  +  +
141  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config
142  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config 2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config 2020-12-18 12:50:59.934881670 +0100
143  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config     2020-12-18 16:42:50.631355859 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/10config     2020-12-18 14:16:59.441109384 +0100
144  @@ -39,7 +39,7 @@  @@ -39,7 +39,7 @@
145     }     }
146   else   else
# Line 192  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 152  diff -ruN smeserver-phpmyadmin-4.0.10.2.
152   # end of  standalone login part   # end of  standalone login part
153  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini  diff -ruN smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini
154  --- smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini       2020-12-18 12:50:59.934881670 +0100  --- smeserver-phpmyadmin-4.0.10.2.old/root/usr/share/phpMyAdmin/.unit.ini       2020-12-18 12:50:59.934881670 +0100
155  +++ smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini   2020-12-18 16:42:50.631355859 +0100  +++ smeserver-phpmyadmin-4.0.10.2/root/usr/share/phpMyAdmin/.unit.ini   2020-12-18 12:53:11.108898355 +0100
156  @@ -1,10 +1,11 @@  @@ -1,10 +1,11 @@
157  -magic_quotes_gpc= on  -magic_quotes_gpc= on
158  -track_vars= on  -track_vars= on

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