From c4938ea9bde51c8b3b6ef16d2368256d5c19404c Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Fri, 25 Dec 2015 19:52:44 -0800
Subject: [PATCH] send and receive with mailsync.sh

---
 roles/mail/files/mailsync.sh | 3 ++-
 roles/mail/tasks/isync.yml   | 5 -----
 roles/mail/tasks/main.yml    | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roles/mail/files/mailsync.sh b/roles/mail/files/mailsync.sh
index 2b50073..7049f3d 100755
--- a/roles/mail/files/mailsync.sh
+++ b/roles/mail/files/mailsync.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 # Original source: http://bit.ly/1Ztk5wg
-# Run mbsync when full internet connectivity is available.
+# Send and receive mail when full internet connectivity is available.
 
 STATE=`nmcli networking connectivity`
 
 if [ $STATE = 'full' ]
 then
+    /usr/local/bin/msmtp-queue -r
     /usr/bin/mbsync -a
     exit $?
 fi
diff --git a/roles/mail/tasks/isync.yml b/roles/mail/tasks/isync.yml
index e79158b..723511a 100644
--- a/roles/mail/tasks/isync.yml
+++ b/roles/mail/tasks/isync.yml
@@ -4,11 +4,6 @@
   tags:
     - mbsync
 
-- name: Push mail sync script
-  copy: src=mailsync.sh dest=/usr/local/bin/mailsync mode=755
-  tags:
-    - mbsync
-
 - name: Push mbsync service file
   copy: src=mbsync.service dest=/etc/systemd/system/mbsync@.service
   when: isync
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 0609e85..8dcd70d 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -12,6 +12,9 @@
 - name: Install notmuch
   pacman: name=notmuch state=present
 
+- name: Push mail sync script
+  copy: src=mailsync.sh dest=/usr/local/bin/mailsync mode=755
+
 - include: msmtp.yml
 - include: isync.yml
 - include: offlineimap.yml