friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Cleanup config 

- Remove deprecated statements
- Move session_handler to right place
- Add new distributed cache capability
This commit is contained in:
Philipp Holzer 2021-12-13 20:12:52 +01:00
parent 69425a7895
commit b3807c23d7
Signed by: nupplaPhil
GPG Key ID: 24A7501396EB5432
30 changed files with 50 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
.config/01redis.config.php
View File

@ -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 {

34
.config/zz-docker.config.php
View File

@ -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';

1
2021.09/apache/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.09/apache/config/01redis.config.php
View File

@ -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 {

34
2021.09/apache/config/zz-docker.config.php
View File

@ -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';

1
2021.09/fpm-alpine/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.09/fpm-alpine/config/01redis.config.php
View File

@ -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 {

34
2021.09/fpm-alpine/config/zz-docker.config.php
View File

@ -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';

1
2021.09/fpm/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.09/fpm/config/01redis.config.php
View File

@ -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 {

34
2021.09/fpm/config/zz-docker.config.php
View File

@ -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';

1
2021.12-dev/apache/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-dev/apache/config/01redis.config.php
View File

@ -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 {

34
2021.12-dev/apache/config/zz-docker.config.php
View File

@ -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';

1
2021.12-dev/fpm-alpine/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-dev/fpm-alpine/config/01redis.config.php
View File

@ -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 {

34
2021.12-dev/fpm-alpine/config/zz-docker.config.php
View File

@ -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';

1
2021.12-dev/fpm/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-dev/fpm/config/01redis.config.php
View File

@ -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 {

34
2021.12-dev/fpm/config/zz-docker.config.php
View File

@ -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';

1
2021.12-rc/apache/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-rc/apache/config/01redis.config.php
View File

@ -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 {

34
2021.12-rc/apache/config/zz-docker.config.php
View File

@ -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';

1
2021.12-rc/fpm-alpine/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-rc/fpm-alpine/config/01redis.config.php
View File

@ -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 {

34
2021.12-rc/fpm-alpine/config/zz-docker.config.php
View File

@ -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';

1
2021.12-rc/fpm/config/00apcu.config.php
View File

@ -7,6 +7,5 @@
return [
'system' => [
'cache_driver' => 'apcu',
'session_handler' => 'cache',
],
];

8
2021.12-rc/fpm/config/01redis.config.php
View File

@ -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 {

34
2021.12-rc/fpm/config/zz-docker.config.php
View File

@ -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';