Merge branch 'buster'

Dockerfile

-FROM registry.git.autistici.org/ai3/docker/apache2-php-base:master
+FROM registry.git.autistici.org/ai3/docker/apache2-php-base:buster
 
 COPY noblogs /opt/noblogs/www
 COPY wp-config.php /opt/noblogs/www/wp-config.php

build.sh

@@ -20,8 +20,7 @@ PACKAGES="
         modsecurity-crs
         php-xml
         php-mysql
-        php-memcache
-        php-mcrypt
+        php-memcached
         php-mbstring
 
         noblogs-cli
@@ -36,7 +35,6 @@ APACHE_MODULES_ENABLE="
 
 # Additional config snippets to enable for Apache.
 APACHE_CONFIG_ENABLE="
-        php7.0-fpm
         modsecurity-custom
 "
 

conf/php/7.0/fpm/conf.d/99-noblogs.ini

-[PHP]
-upload_max_filesize = 50M
-post_max_size = 50M
-

conf/php/7.3/fpm/conf.d/99-noblogs.ini

+[PHP]
+memory_limit = 256M
+upload_max_filesize = 50M
+post_max_size = 50M
+
+session.cookie_secure = 1
+session.cookie_httponly = 1
+session.save_handler = memcached
+session.save_path = "127.0.0.1:7108"
+memcached.sess_consistent_hash = 1
+memcached.sess_binary = 1
+
+opcache.enable = 1
+

conf/php/7.0/fpm/pool.d/www.conf → conf/php/7.3/fpm/pool.d/www.conf

 [www]
-listen = /run/php/php7.0-fpm.sock
+listen = /run/php/php7.3-fpm.sock
 
 pm = dynamic
 pm.max_children = 55
@@ -17,6 +17,8 @@ pm.status_path = /status
 ; Default Value: no
 catch_workers_output = yes
 
+access.log = /proc/self/fd/2
+
 chdir = /
 
 ; Already enabled by default - do not enable twice.
@@ -25,5 +27,4 @@ php_admin_value[opcache.memory_consumption] = 64
 php_admin_value[opcache.interned_strings_buffer] = 16
 php_admin_value[opcache.max_accelerated_files] = 4000
 php_admin_value[opcache.validate_timestamps] = 0
-php_admin_value[opcache.fast_shutdown] = 1
 

wp-config.php

@@ -133,7 +133,7 @@ define('R2DB_FLEXIHASH_REPLICAS', 128);
 /*
  * A/I patch: global recaptcha key.
  */
-if (in_array('recaptcha', $noblogs_config)) {
+if (array_key_exists('recaptcha', $noblogs_config)) {
     define('GLOBAL_RECAPTCHA_KEY', $noblogs_config['recaptcha']['key']);
     define('GLOBAL_RECAPTCHA_PRIVATE_KEY', $noblogs_config['recaptcha']['private_key']);
 }
@@ -141,7 +141,7 @@ if (in_array('recaptcha', $noblogs_config)) {
 /*
  * A/I Patch: print debug info on demand when the debug cookie is set.
  */
-if (in_array('debug_cookie_name', $noblogs_config) &&
+if (array_key_exists('debug_cookie_name', $noblogs_config) &&
     !empty($_COOKIE[$noblogs_config['debug_cookie_name']])) {
         define('WP_DEBUG', true);
         define('WP_DEBUG_LOG', true);