mxmehl/dynamic-status
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding msmtp-queue-handler depending on off/on status; make msmtp-queue paths configurable; reset counter when queue=0

Browse Source
This commit is contained in:
mxmehl
2016-11-23 12:44:29 +01:00
parent 42e41f3968
commit 3e0ec4d05a
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config.cfg.sample
View File

@@ -15,3 +15,8 @@ VPNIP="1.2.3.4|90.80.70.60"
# status-misc.sh # status-misc.sh
SVNSTATUS = http://website.showing."fin;revision".or.similar SVNSTATUS = http://website.showing."fin;revision".or.similar
# MSMTP paths
MSMTP_LIST=/usr/local/bin/msmtp-listqueue.sh
MSMTP_RUN=/usr/local/bin/msmtp-runqueue.sh
MSMTP_EN=/usr/local/bin/msmtp-enqueue.sh

17
msmtp-handler.sh Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/bash
# If offline, direct mail to msmtp-enqueue.sh
# If online, direct mail to msmtp directly
CURDIR=$(dirname "$(readlink -f "$0")")
source "$CURDIR"/shared-functions.so
mail=$(cat)
par="$@"
if [ "$var_conn" == "off" ]; then
echo "$mail" | $MSMTP_EN $par
else
echo "$mail" | msmtp $par
fi

6
status-interaction.sh
View File

@@ -5,16 +5,16 @@ source "$CURDIR"/shared-functions.so
# MAIL QUEUE ACTIONS # MAIL QUEUE ACTIONS
function send_mailqueue { # send queued mails function send_mailqueue { # send queued mails
msmtp-listqueue.sh $MSMTP_LIST
read -p "Send these queued mails? [Y/n]: " YN read -p "Send these queued mails? [Y/n]: " YN
if [[ $YN =~ ^(Y|y|)$ ]]; then if [[ $YN =~ ^(Y|y|)$ ]]; then
msmtp-runqueue.sh $MSMTP_RUN
else else
echo "Not sending emails" echo "Not sending emails"
fi fi
} }
function list_mailqueue { # list emails in queue only function list_mailqueue { # list emails in queue only
msmtp-listqueue.sh $MSMTP_LIST
} }
# CHANGE ONLINE STATUS # CHANGE ONLINE STATUS

4
status-misc.sh
View File

@@ -17,13 +17,15 @@ function isonline {
# NUMBER OF UNSENT EMAILS # NUMBER OF UNSENT EMAILS
function check_mailqueue { function check_mailqueue {
QUEUE=$(msmtp-listqueue.sh | grep -o "^From: " | wc -l) QUEUE=$($MSMTP_LIST | grep -o "^From: " | wc -l)
OUT="$OUT;mq=$QUEUE" OUT="$OUT;mq=$QUEUE"
TOOL="$TOOL;conn=$var_conn" TOOL="$TOOL;conn=$var_conn"
# If $QUEUE > 0 and >10 runs, show notification # If $QUEUE > 0 and >10 runs, show notification
if [ "$QUEUE" -gt 0 ]; then if [ "$QUEUE" -gt 0 ]; then
var_mailqueue_runs=$(($var_mailqueue_runs + 1)) var_mailqueue_runs=$(($var_mailqueue_runs + 1))
else
var_mailqueue_runs=0 # reset counter if queue is empty again
fi fi
if [ "$QUEUE" -gt 0 ] && [ "$var_mailqueue_runs" -gt 9 ]; then if [ "$QUEUE" -gt 0 ] && [ "$var_mailqueue_runs" -gt 9 ]; then
notify-send "There are mails in the mailqueue. Remember sending them manually or switch online status." notify-send "There are mails in the mailqueue. Remember sending them manually or switch online status."