github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 12:30:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made sendmail command configurable

Browse Source 
For #4001
Added simple test to cover config option.
This commit is contained in:
Dan Brown 2023-02-17 14:25:38 +00:00
parent 08b39500b3
commit af31a6fc1b
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.example.complete
View File

@ -80,6 +80,9 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
# Command to use when email is sent via sendmail
MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
# Cache & Session driver to use # Cache & Session driver to use
# Can be 'file', 'database', 'memcached' or 'redis' # Can be 'file', 'database', 'memcached' or 'redis'
CACHE_DRIVER=file CACHE_DRIVER=file

2
app/Config/mail.php
View File

@ -38,7 +38,7 @@ return [
'sendmail' => [ 'sendmail' => [
'transport' => 'sendmail', 'transport' => 'sendmail',
'path' => '/usr/sbin/sendmail -bs', 'path' => env('MAIL_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'),
], ],
'log' => [ 'log' => [

5
tests/Unit/ConfigTest.php
View File

@ -96,6 +96,11 @@ class ConfigTest extends TestCase
$this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'snappy.pdf.options.page-size', 'A4'); $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'snappy.pdf.options.page-size', 'A4');
} }
public function test_sendmail_command_is_configurage()
{
$this->checkEnvConfigResult('MAIL_SENDMAIL_COMMAND', '/var/sendmail -o', 'mail.mailers.sendmail.path', '/var/sendmail -o');
}
/** /**
* Set an environment variable of the given name and value * Set an environment variable of the given name and value
* then check the given config key to see if it matches the given result. * then check the given config key to see if it matches the given result.