Merge pull request #1628 from aendeavor/master

possible fix for tomav#1383
This commit is contained in:
Erik Wramner 2020-09-28 14:24:29 +02:00 committed by GitHub
commit a0c2dc27c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions

0
config/user-patches.sh.dist Normal file → Executable file
View File

View File

@ -1757,13 +1757,18 @@ function _setup_logwatch()
function _setup_user_patches()
{
_notify 'inf' 'Executing user-patches.sh'
if [[ -f /tmp/docker-mailserver/user-patches.sh ]]
then
chmod +x /tmp/docker-mailserver/user-patches.sh
/tmp/docker-mailserver/user-patches.sh
_notify 'inf' "Executed 'config/user-patches.sh'"
_notify 'inf' 'Executing user-patches.sh'
chmod +x /tmp/docker-mailserver/user-patches.sh &>/dev/null || true
if [[ -x /tmp/docker-mailserver/user-patches.sh ]]
then
/tmp/docker-mailserver/user-patches.sh
_notify 'inf' "Executed 'config/user-patches.sh'"
else
_notify 'err' "Could not execute user-patches.sh. Not executable!"
fi
else
_notify 'inf' "No user patches executed because optional '/tmp/docker-mailserver/user-patches.sh' is not provided."
fi