/[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.1 by jcrisp, Fri Dec 18 15:44:29 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-18 16:33:05.269855203 +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,14 @@  @@ -1,14 +1,14 @@
5   {   {
6   # phpmyadmin   # phpmyadmin
# Line 50  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 50  diff -ruN smeserver-phpmyadmin-4.0.10.2.
50    
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-18 16:11:18.242843437 +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,11 @@  @@ -1,7 +1,11 @@
55  +#  +#
56  +# 30phpmyadmin  +# 30phpmyadmin
# Line 67  diff -ruN smeserver-phpmyadmin-4.0.10.2. Line 67  diff -ruN smeserver-phpmyadmin-4.0.10.2.
67           {           {
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-18 16:32:44.798527156 +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,70 @@  @@ -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 102  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 141  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:11:18.243843454 +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 153  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:11:18.243843454 +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