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

Merge pull request #147 from nupplaphil/bug/smtp_domain 

Fix usage of "SMTP_DOMAIN"
This commit is contained in:
Michael Vogel 2021-03-27 22:32:05 +01:00 committed by GitHub
parent 2e6fb3ed05 969e173e59
commit 500708b304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2020.09/apache/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2020.09/fpm-alpine/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2020.09/fpm/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.01/apache/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.01/fpm-alpine/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.01/fpm/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-dev/apache/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-dev/fpm-alpine/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-dev/fpm/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-rc/apache/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-rc/fpm-alpine/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;

6
2021.03-rc/fpm/config/zz-docker.config.php
View File

@ -59,4 +59,10 @@ if (!empty(getenv('FRIENDICA_DEBUGGING'))) {
}
}
if (!empty(getenv('SMTP_DOMAIN'))) {
$smtp_from = !empty(getenv('SMTP_FROM')) ? getenv('SMTP_FROM') : 'no-reply';
$config['config']['sender_email'] = $smtp_from . "@" . getenv('SMTP_DOMAIN');
}
return $config;