--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch 2020/12/22 13:51:37 1.2 +++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch 2021/02/28 03:30:17 1.3 @@ -1,11 +1,9 @@ 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 --- 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/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias 2020-12-22 14:43:20.167546078 +0100 -@@ -1,14 +1,15 @@ -+# 86PhpmyadminAlias Start ++++ 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 +@@ -1,14 +1,14 @@ { --# phpmyadmin -+ + # phpmyadmin my $status = $phpmyadmin{'status'} || 'disabled'; - + @@ -20,30 +18,6 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled'); my $multiaccess = ($phpmyadmin{'multiaccess'} || 'disabled'); if (("$adminaccess" eq "enabled") || ("$multiaccess" eq "enabled")) -@@ -29,7 +30,6 @@ - $OUT .= "# phpMyAdmin Multiuser access disabled\n"; - } - -- - $OUT .= qq( - - AuthName "phpmyadmin" -@@ -41,6 +41,7 @@ - - $OUT .= qq( - -+ 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") @@ -60,27 +60,16 @@ $OUT .= "allow from all"; } @@ -74,17 +48,14 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. -@@ -118,4 +107,4 @@ - $OUT .= "# phpmyadmin is disabled"; - } - } -- -+# 86PhpmyadminAlias End 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 --- 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/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30PhpmyadminAlias 2020-12-22 14:43:33.375754951 +0100 -@@ -1,7 +1,8 @@ -+# 30phpmyadmin start ++++ 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 +@@ -1,7 +1,11 @@ ++# ++# 30phpmyadmin ++# ++ { $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no'; -my $adminaccess = ($phpmyadmin{'adminaccess'} || 'enabled'); @@ -94,26 +65,20 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. if (($port eq "80") && ($haveSSL eq 'yes') && ("$adminaccess" eq "enabled" || "$multiaccess" eq "enabled")) { -@@ -14,4 +15,4 @@ - $OUT .= " RewriteRule ^/phpmyadmin-multi(/.*|\$) https://%{HTTP_HOST}/phpmyadmin-multi\$1 [L,R]\n"; - } - } -- -+# 30phpmyadmin end 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 --- 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/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15phpmyadmin 2020-12-22 14:11:13.590207009 +0100 -@@ -0,0 +1,74 @@ ++++ 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 +@@ -0,0 +1,69 @@ +{ + -+if ($PHP_VERSION eq '73'){ ++if ($PHP_VERSION eq '74'){ + if (($phpmyadmin{'status'} || 'disabled') eq 'enabled'){ + my $max_upload_size = ($phpmyadmin{MaxUploadSize} || '100M');# 104857600 bytes + $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/); + my $memory_limit = ($phpmyadmin{MemoryLimit} || '512M'); + $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/); + my $open_basedir= $phpmyadmin{PHPBaseDir} || ''; -+ $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"; + my $max_children = $phpmyadmin{'PHPmaxChildren'} || 20; + my $min_spare_servers = $phpmyadmin{'PHPminServers'} || 4; + my $start_servers = $phpmyadmin{'PHPstartServers'} || 6; @@ -137,17 +102,16 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. +pm.min_spare_servers = $min_spare_servers +pm.max_spare_servers = $max_spare_servers +pm.max_requests = $max_requests -+; Used in nextcloud -+;php_admin_value[session.save_path] = /var/lib/php/$id/session -+; Deprecated -+;php_admin_value[session.gc_maxlifetime] = 86400 -+; Used in nextcloud -+;php_admin_value[opcache.file_cache] = /var/lib/php/$id/opcache -+; Note the capitalisation here - can't use $id ++# Used in nextcloud ++#php_admin_value[session.save_path] = /var/lib/php/$id/session ++php_admin_value[session.gc_maxlifetime] = 86400 ++# Used in nextcloud ++#php_admin_value[opcache.file_cache] = /var/lib/php/$id/opcache ++# Note the cpaitalisation here - can't use $id +php_admin_value[upload_tmp_dir] = /var/lib/php/phpMyAdmin/tmp +php_admin_value[error_log] = /var/log/php/$id/error.log -+; Is slowlog needed? -+; slowlog = /var/log/php/phpmyadmin/slow.log ++# Is slowlog needed? ++# slowlog = /var/log/php/phpmyadmin/slow.log +php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName } +php_admin_flag[display_errors] = off +php_admin_flag[log_errors] = on @@ -165,10 +129,6 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. +php_admin_value[session.save_handler] = files +php_admin_flag[output_buffering] = off + -+; For HTTP AUTH -+; disabled for now -+;php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php -+ +_EOF + + } @@ -180,7 +140,7 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. + 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 --- 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/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 @@ -39,7 +39,7 @@ } else @@ -192,7 +152,7 @@ diff -ruN smeserver-phpmyadmin-4.0.10.2. # end of standalone login part 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 --- 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/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 @@ -1,10 +1,11 @@ -magic_quotes_gpc= on -track_vars= on