diff --git a/src/bash/filter.sh b/src/bash/filter.sh index 413d361..4f39144 100755 --- a/src/bash/filter.sh +++ b/src/bash/filter.sh @@ -48,7 +48,7 @@ DEFAULT_PERIOD="month" DEFAULT_TRACK="" cd $(dirname $0) -DOMAINNAME=$(cat domainname) +DOMAINEDEPOT=$(cat domainedepot) # Exit codes from EX_TEMPFAIL=75 EX_UNAVAILABLE=69 @@ -62,7 +62,7 @@ MAILS=/tmp/FILTER MAX_KEEP_IN_MAIL=5ki MAX_UPLOAD_SIZE=1Gi SHRINK_CMD=/home/filter/eMailShrinker -JIRAFEAU_URL=https://depot.${DOMAINNAME:-"kaz.bzh"} +JIRAFEAU_URL=https://depot.${DOMAINEDEPOT:-"kaz.bzh"} JIRAFEAU_LOCAL=http://depot MD5_CMD=/usr/bin/md5sum DISCLAMER_CMD=altermime diff --git a/src/bash/filterTest.sh b/src/bash/filterTest.sh index d515e08..3fe855d 100755 --- a/src/bash/filterTest.sh +++ b/src/bash/filterTest.sh @@ -87,8 +87,8 @@ eMailShrinker="$(realpath "./eMailShrinker")" ######################################## dos2unix "${mbox}" -[ -z "${SIMULATE}" ] && DOMAINNAME="$(cat domainname)" -JIRAFEAU_URL="https://depot.${DOMAINNAME}" +[ -z "${SIMULATE}" ] && DOMAINEDEPOT="$(cat domainedepot)" +JIRAFEAU_URL="https://depot.${DOMAINEDEPOT}" JIRAFEAU_LOCAL="${JIRAFEAU_URL}" TMP_DIR="$(mktemp)"