From 523a0e25a989ef9f5b9dccd28114f5df4c7a79d1 Mon Sep 17 00:00:00 2001 From: Georg Lauterbach Date: Wed, 9 Sep 2020 11:19:57 +0200 Subject: [PATCH] fixing #1563 --- Dockerfile | 3 +-- setup.sh | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 904c725f..c09367a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -182,8 +182,7 @@ COPY target/fail2ban/filter.d/postfix-sasl.conf /etc/fail2ban/filter.d/postfix-s RUN mkdir /var/run/fail2ban # Enables Pyzor and Razor -RUN su - amavis -c "razor-admin -create && \ - razor-admin -register" +RUN su - amavis -c "razor-admin -create && razor-admin -register" # Configure DKIM (opendkim) # DKIM config files diff --git a/setup.sh b/setup.sh index 31386d26..ffe68c07 100755 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ # included in the docker-mailserver set -euEo pipefail -trap '_report_err ${_} ${LINENO} ${?}' ERR +trap '_report_err ${_:-"SOURCE UNKNOWN"} ${LINENO} ${?}' ERR function _report_err() { @@ -274,9 +274,9 @@ function _main() alias) shift ; case ${1:-} in - add ) shift ; _docker_image addalias "${@}" ;; - del ) shift ; _docker_image delalias "${@}" ;; - list ) shift ; _docker_image listalias "${@}" ;; + add ) shift ; _docker_image addalias "${1}" "${2}" ;; + del ) shift ; _docker_image delalias "${1}" "${2}" ;; + list ) shift ; _docker_image listalias ;; * ) _usage ;; esac ;;