From b3807c23d74aa0c8b026e7986a432c9f019befc5 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Mon, 13 Dec 2021 20:12:52 +0100
Subject: [PATCH] Cleanup config - Remove deprecated statements - Move
 session_handler to right place - Add new distributed cache capability

---
 .config/00apcu.config.php                     |  1 -
 .config/01redis.config.php                    |  8 +++--
 .config/zz-docker.config.php                  | 34 -------------------
 2021.09/apache/config/00apcu.config.php       |  1 -
 2021.09/apache/config/01redis.config.php      |  8 +++--
 2021.09/apache/config/zz-docker.config.php    | 34 -------------------
 2021.09/fpm-alpine/config/00apcu.config.php   |  1 -
 2021.09/fpm-alpine/config/01redis.config.php  |  8 +++--
 .../fpm-alpine/config/zz-docker.config.php    | 34 -------------------
 2021.09/fpm/config/00apcu.config.php          |  1 -
 2021.09/fpm/config/01redis.config.php         |  8 +++--
 2021.09/fpm/config/zz-docker.config.php       | 34 -------------------
 2021.12-dev/apache/config/00apcu.config.php   |  1 -
 2021.12-dev/apache/config/01redis.config.php  |  8 +++--
 .../apache/config/zz-docker.config.php        | 34 -------------------
 .../fpm-alpine/config/00apcu.config.php       |  1 -
 .../fpm-alpine/config/01redis.config.php      |  8 +++--
 .../fpm-alpine/config/zz-docker.config.php    | 34 -------------------
 2021.12-dev/fpm/config/00apcu.config.php      |  1 -
 2021.12-dev/fpm/config/01redis.config.php     |  8 +++--
 2021.12-dev/fpm/config/zz-docker.config.php   | 34 -------------------
 2021.12-rc/apache/config/00apcu.config.php    |  1 -
 2021.12-rc/apache/config/01redis.config.php   |  8 +++--
 2021.12-rc/apache/config/zz-docker.config.php | 34 -------------------
 .../fpm-alpine/config/00apcu.config.php       |  1 -
 .../fpm-alpine/config/01redis.config.php      |  8 +++--
 .../fpm-alpine/config/zz-docker.config.php    | 34 -------------------
 2021.12-rc/fpm/config/00apcu.config.php       |  1 -
 2021.12-rc/fpm/config/01redis.config.php      |  8 +++--
 2021.12-rc/fpm/config/zz-docker.config.php    | 34 -------------------
 30 files changed, 50 insertions(+), 380 deletions(-)

diff --git a/.config/00apcu.config.php b/.config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/.config/00apcu.config.php
+++ b/.config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/.config/01redis.config.php b/.config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/.config/01redis.config.php
+++ b/.config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/.config/zz-docker.config.php b/.config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/.config/zz-docker.config.php
+++ b/.config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.09/apache/config/00apcu.config.php b/2021.09/apache/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.09/apache/config/00apcu.config.php
+++ b/2021.09/apache/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.09/apache/config/01redis.config.php b/2021.09/apache/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.09/apache/config/01redis.config.php
+++ b/2021.09/apache/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.09/apache/config/zz-docker.config.php b/2021.09/apache/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.09/apache/config/zz-docker.config.php
+++ b/2021.09/apache/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.09/fpm-alpine/config/00apcu.config.php b/2021.09/fpm-alpine/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.09/fpm-alpine/config/00apcu.config.php
+++ b/2021.09/fpm-alpine/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.09/fpm-alpine/config/01redis.config.php b/2021.09/fpm-alpine/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.09/fpm-alpine/config/01redis.config.php
+++ b/2021.09/fpm-alpine/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.09/fpm-alpine/config/zz-docker.config.php b/2021.09/fpm-alpine/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.09/fpm-alpine/config/zz-docker.config.php
+++ b/2021.09/fpm-alpine/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.09/fpm/config/00apcu.config.php b/2021.09/fpm/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.09/fpm/config/00apcu.config.php
+++ b/2021.09/fpm/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.09/fpm/config/01redis.config.php b/2021.09/fpm/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.09/fpm/config/01redis.config.php
+++ b/2021.09/fpm/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.09/fpm/config/zz-docker.config.php b/2021.09/fpm/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.09/fpm/config/zz-docker.config.php
+++ b/2021.09/fpm/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-dev/apache/config/00apcu.config.php b/2021.12-dev/apache/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-dev/apache/config/00apcu.config.php
+++ b/2021.12-dev/apache/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-dev/apache/config/01redis.config.php b/2021.12-dev/apache/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-dev/apache/config/01redis.config.php
+++ b/2021.12-dev/apache/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-dev/apache/config/zz-docker.config.php b/2021.12-dev/apache/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-dev/apache/config/zz-docker.config.php
+++ b/2021.12-dev/apache/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-dev/fpm-alpine/config/00apcu.config.php b/2021.12-dev/fpm-alpine/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-dev/fpm-alpine/config/00apcu.config.php
+++ b/2021.12-dev/fpm-alpine/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-dev/fpm-alpine/config/01redis.config.php b/2021.12-dev/fpm-alpine/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-dev/fpm-alpine/config/01redis.config.php
+++ b/2021.12-dev/fpm-alpine/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-dev/fpm-alpine/config/zz-docker.config.php b/2021.12-dev/fpm-alpine/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-dev/fpm-alpine/config/zz-docker.config.php
+++ b/2021.12-dev/fpm-alpine/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-dev/fpm/config/00apcu.config.php b/2021.12-dev/fpm/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-dev/fpm/config/00apcu.config.php
+++ b/2021.12-dev/fpm/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-dev/fpm/config/01redis.config.php b/2021.12-dev/fpm/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-dev/fpm/config/01redis.config.php
+++ b/2021.12-dev/fpm/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-dev/fpm/config/zz-docker.config.php b/2021.12-dev/fpm/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-dev/fpm/config/zz-docker.config.php
+++ b/2021.12-dev/fpm/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-rc/apache/config/00apcu.config.php b/2021.12-rc/apache/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-rc/apache/config/00apcu.config.php
+++ b/2021.12-rc/apache/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-rc/apache/config/01redis.config.php b/2021.12-rc/apache/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-rc/apache/config/01redis.config.php
+++ b/2021.12-rc/apache/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-rc/apache/config/zz-docker.config.php b/2021.12-rc/apache/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-rc/apache/config/zz-docker.config.php
+++ b/2021.12-rc/apache/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-rc/fpm-alpine/config/00apcu.config.php b/2021.12-rc/fpm-alpine/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-rc/fpm-alpine/config/00apcu.config.php
+++ b/2021.12-rc/fpm-alpine/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-rc/fpm-alpine/config/01redis.config.php b/2021.12-rc/fpm-alpine/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-rc/fpm-alpine/config/01redis.config.php
+++ b/2021.12-rc/fpm-alpine/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-rc/fpm-alpine/config/zz-docker.config.php b/2021.12-rc/fpm-alpine/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-rc/fpm-alpine/config/zz-docker.config.php
+++ b/2021.12-rc/fpm-alpine/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
 
diff --git a/2021.12-rc/fpm/config/00apcu.config.php b/2021.12-rc/fpm/config/00apcu.config.php
index d6dac4f..2e5ebcf 100644
--- a/2021.12-rc/fpm/config/00apcu.config.php
+++ b/2021.12-rc/fpm/config/00apcu.config.php
@@ -7,6 +7,5 @@
 return [
 	'system' => [
 		'cache_driver' => 'apcu',
-		'session_handler' => 'cache',
 	],
 ];
diff --git a/2021.12-rc/fpm/config/01redis.config.php b/2021.12-rc/fpm/config/01redis.config.php
index 1a43c95..2ea29bd 100644
--- a/2021.12-rc/fpm/config/01redis.config.php
+++ b/2021.12-rc/fpm/config/01redis.config.php
@@ -3,11 +3,13 @@
 if (getenv('REDIS_HOST')) {
 	return [
 		'system' => [
+			'session_handler' => 'cache',
+			'distributed_cache_driver' => 'redis',
 			'lock_driver' => 'redis',
 			'redis_host' => getenv('REDIS_HOST'),
-			'redis_port' => (getenv('REDIS_PORT') ? getenv('REDIS_PORT') : ''),
-			'redis_password' => (getenv('REDIS_PW') ? getenv('REDIS_PW') : ''),
-			'redis_db' => (getenv('REDIS_DB') ? getenv('REDIS_DB') : 0),
+			'redis_port' => (getenv('REDIS_PORT') ?: ''),
+			'redis_password' => (getenv('REDIS_PW') ?: ''),
+			'redis_db' => (getenv('REDIS_DB') ?: 0),
 		],
 	];
 } else {
diff --git a/2021.12-rc/fpm/config/zz-docker.config.php b/2021.12-rc/fpm/config/zz-docker.config.php
index 49ca5bd..946fe81 100644
--- a/2021.12-rc/fpm/config/zz-docker.config.php
+++ b/2021.12-rc/fpm/config/zz-docker.config.php
@@ -20,45 +20,11 @@ $config = [
 	],
 ];
 
-if (getenv('FRIENDICA_TZ')) {
-	$config['config']['timezone'] = getenv('FRIENDICA_TZ');
-}
-
-if (getenv('FRIENDICA_LANG')) {
-	$config['config']['language'] = getenv('FRIENDICA_LANG');
-}
-
-if (getenv('FRIENDICA_ADMIN_MAIL')) {
-	$config['config']['admin_email'] = getenv('FRIENDICA_ADMIN_MAIL');
-}
-
-if (getenv('FRIENDICA_SITENAME')) {
-	$config['config']['sitename'] = getenv('FRIENDICA_SITENAME');
-}
-
 if (!empty(getenv('FRIENDICA_NO_VALIDATION'))) {
 	$config['system']['disable_url_validation'] = true;
 	$config['system']['disable_email_validation'] = true;
 }
 
-if (!empty(getenv('FRIENDICA_DATA'))) {
-	$config['storage']['class'] = \Friendica\Model\Storage\Filesystem::class;
-
-	if (!empty(getenv('FRIENDICA_DATA_DIR'))) {
-		$config['storage']['filesystem_path'] = getenv('FRIENDICA_DATA');
-	}
-}
-
-if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
-	$config['system']['debugging'] = true;
-	if (!empty(getenv('FRIENDICA_LOGFILE'))) {
-		$config['system']['logfile'] = getenv('FRIENDICA_LOGFILE');
-	}
-	if (!empty(getenv('FRIENDICA_LOGLEVEL'))) {
-		$config['system']['loglevel'] = getenv('FRIENDICA_LOGLEVEL');
-	}
-}
-
 if (!empty(getenv('SMTP_DOMAIN'))) {
 	$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';