forked from github/server
Merge branch 'master' into develop
This commit is contained in:
commit
d22af93d5e
|
@ -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?
|
||||||
|
|
|
@ -17,10 +17,13 @@ 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" "$@")"
|
||||||
rm -f "$LOCKFILE"
|
if [ -e "$ACCEPT_FILE" ]
|
||||||
filename=$(basename "$ACCEPT_FILE")
|
|
||||||
email="$ACCEPT_MAIL"
|
|
||||||
if [ -d "$ERESSEA/orders-php" ]
|
|
||||||
then
|
then
|
||||||
php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
|
rm -f "$LOCKFILE"
|
||||||
|
filename=$(basename "$ACCEPT_FILE")
|
||||||
|
email="$ACCEPT_MAIL"
|
||||||
|
if [ -d "$ERESSEA/orders-php" ]
|
||||||
|
then
|
||||||
|
php "$ERESSEA/orders-php/cli.php" insert "$filename" "$lang" "$email"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue