Merge branch 'master' of github.com:ennorehling/eressea

This commit is contained in:
Enno Rehling 2020-03-19 20:28:51 +01:00
commit af38880b15
2 changed files with 9 additions and 6 deletions

View File

@ -52,7 +52,7 @@ hostname = socket.gethostname()
orderbase = "orders.dir"
sendmail = True
# maximum number of reports per sender:
maxfiles = 30
maxfiles = 50
# write headers to file?
writeheaders = True
# reject all html email?

View File

@ -17,6 +17,8 @@ mkdir -p orders.dir
cd orders.dir
lockfile -r3 -l120 "$LOCKFILE"
eval "$(python "$BIN/accept-orders.py" "$@")"
if [ -e "$ACCEPT_FILE" ]
then
rm -f "$LOCKFILE"
filename=$(basename "$ACCEPT_FILE")
email="$ACCEPT_MAIL"
@ -24,3 +26,4 @@ if [ -d "$ERESSEA/orders-php" ]
then
php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
fi
fi