diff --git a/Dockerfile b/Dockerfile index 854a56b..483011e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,7 +68,7 @@ COPY start.sh /usr/local/bin/start.sh COPY config.sh /usr/local/bin/config.sh COPY run.sh /usr/local/bin/run.sh -RUN chmod +x /usr/local/bin/start.sh && \ +RUN chmod +x /usr/local/bin/start.sh /usr/local/bin/config.sh /usr/local/bin/run.sh && \ mkdir -p /var/www && \ mkdir -p /srv/ledgersmb/local/conf && \ chown -R www-data /srv/ledgersmb/local diff --git a/config.sh b/config.sh index b5679b6..f7a3635 100755 --- a/config.sh +++ b/config.sh @@ -35,7 +35,7 @@ fi if [[ -n "$SSMTP_USE_STARTTLS" ]]; then echo "\$SSMTP_USE_STARTTLS set; parameter is deprecated" if [[ -z "$LSMB_MAIL_SMTPTLS" ]]; then - echo " Deriving \$LSMB_MAIL_SMTPSENDER_HOSTNAME setting from \$SSMTP_USE_STARTTLS" + echo " Deriving \$LSMB_MAIL_SMTPTLS setting from \$SSMTP_USE_STARTTLS" LSMB_MAIL_SMTPTLS=$SSMTP_USE_STARTTLS fi LSMB_HAVE_DEPRECATED=1 diff --git a/start.sh b/start.sh index 975926e..d1b1a9d 100755 --- a/start.sh +++ b/start.sh @@ -1,5 +1,6 @@ #!/bin/bash -home_dir="$(dirname `readlink -f $BASH_SOURCE`)" -"$home_dir/config.sh" || (echo "Failed configuration" ; exit) -exec "$home_dir/run.sh" \ No newline at end of file +home_dir="$(dirname $(readlink -f $BASH_SOURCE))" +"$home_dir/config.sh" || { echo "Failed configuration" ; exit 1 } + +exec "$home_dir/run.sh"