Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2019-12-25 20:44:25 +01:00
parent 2573ab19b5 face5eeb31
commit d22af93d5e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process/accept-orders.py
View File

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

3
process/orders-accept
View File

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