From f18979f1ec30ea0261e4b1059eedb2455a9e8744 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 22 Jul 2020 12:08:08 +0200 Subject: [PATCH] Move SSMTP Setup to outside of the check since it has to get checked for cronjobs too --- docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 40303f9..8d5931d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -50,6 +50,8 @@ setup_ssmtp() { fi } +setup_ssmtp + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" @@ -65,8 +67,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then exit 1 fi - setup_ssmtp - # check it just in case the version is greater or if we force the upgrade if version_greater "$image_version" "$installed_version" || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then echo "Initializing Friendica $image_version ..."