From af74551506746b7347bb796e32d06db85521fdd0 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Tue, 17 Apr 2018 17:33:43 -0700
Subject: Move mail stuff to host-specific and configure a timer

---
 base/mbsyncrc                                      | 52 -------------------
 base/msmtprc                                       |  9 ----
 host-overrides/jesterpm.net/config/systemd/.nolink |  0
 .../jesterpm.net/config/systemd/user/.nolink       |  0
 .../config/systemd/user/mbsync.service             |  6 +++
 .../jesterpm.net/config/systemd/user/mbsync.timer  | 10 ++++
 host-overrides/jesterpm.net/mbsyncrc               | 58 ++++++++++++++++++++++
 host-overrides/jesterpm.net/msmtprc                |  9 ++++
 8 files changed, 83 insertions(+), 61 deletions(-)
 delete mode 100644 base/mbsyncrc
 delete mode 100644 base/msmtprc
 create mode 100644 host-overrides/jesterpm.net/config/systemd/.nolink
 create mode 100644 host-overrides/jesterpm.net/config/systemd/user/.nolink
 create mode 100644 host-overrides/jesterpm.net/config/systemd/user/mbsync.service
 create mode 100644 host-overrides/jesterpm.net/config/systemd/user/mbsync.timer
 create mode 100644 host-overrides/jesterpm.net/mbsyncrc
 create mode 100644 host-overrides/jesterpm.net/msmtprc

diff --git a/base/mbsyncrc b/base/mbsyncrc
deleted file mode 100644
index ae7f985..0000000
--- a/base/mbsyncrc
+++ /dev/null
@@ -1,52 +0,0 @@
-IMAPAccount gmail
-Host imap.gmail.com
-User jesterpm@gmail.com
-PassCmd "imap-pass -g jesterpm@gmail.com"
-SSLType IMAPS
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
-Path ~/.maildir/
-Inbox ~/.maildir/INBOX
-
-Channel sync-gmail-default
-Master :gmail-remote:
-Slave :gmail-local:
-Patterns "INBOX"
-Expunge Both
-
-Channel sync-gmail-sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:sent
-Expunge Both
-
-Channel sync-gmail-trash
-Master :gmail-remote:"[Gmail]/Bin"
-Slave :gmail-local:trash
-Expunge Both
-
-Channel sync-gmail-drafts
-Master :gmail-remote:"[Gmail]/Drafts"
-Slave :gmail-local:drafts
-Expunge Both
-
-Channel sync-gmail-archive
-Master :gmail-remote:"[Gmail]/All Mail"
-Slave :gmail-local:archive
-Expunge Both
-
-Channel sync-gmail-spam
-Master :gmail-remote:"[Gmail]/Spam"
-Slave :gmail-local:spam
-Expunge Both
-
-Group gmail
-Channel sync-gmail-default
-Channel sync-gmail-sent
-Channel sync-gmail-trash
-Channel sync-gmail-drafts
-Channel sync-gmail-archive
-Channel sync-gmail-spam
diff --git a/base/msmtprc b/base/msmtprc
deleted file mode 100644
index 809766e..0000000
--- a/base/msmtprc
+++ /dev/null
@@ -1,9 +0,0 @@
-account default
-from jesse@jesterpm.net
-host smtp.jesterpm.net
-auth on
-user jesse@jesterpm.net
-tls
-tls_starttls off
-tls_trust_file /etc/ssl/certs/ca-certificates.crt
-logfile ~/.msmtp.log
diff --git a/host-overrides/jesterpm.net/config/systemd/.nolink b/host-overrides/jesterpm.net/config/systemd/.nolink
new file mode 100644
index 0000000..e69de29
diff --git a/host-overrides/jesterpm.net/config/systemd/user/.nolink b/host-overrides/jesterpm.net/config/systemd/user/.nolink
new file mode 100644
index 0000000..e69de29
diff --git a/host-overrides/jesterpm.net/config/systemd/user/mbsync.service b/host-overrides/jesterpm.net/config/systemd/user/mbsync.service
new file mode 100644
index 0000000..b449d1e
--- /dev/null
+++ b/host-overrides/jesterpm.net/config/systemd/user/mbsync.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Mailbox synchronization service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/mbsync -Va
diff --git a/host-overrides/jesterpm.net/config/systemd/user/mbsync.timer b/host-overrides/jesterpm.net/config/systemd/user/mbsync.timer
new file mode 100644
index 0000000..82ebb83
--- /dev/null
+++ b/host-overrides/jesterpm.net/config/systemd/user/mbsync.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Mailbox synchronization timer
+
+[Timer]
+OnBootSec=2m
+OnUnitActiveSec=5m
+Unit=mbsync.service
+
+[Install]
+WantedBy=timers.target
diff --git a/host-overrides/jesterpm.net/mbsyncrc b/host-overrides/jesterpm.net/mbsyncrc
new file mode 100644
index 0000000..2046be9
--- /dev/null
+++ b/host-overrides/jesterpm.net/mbsyncrc
@@ -0,0 +1,58 @@
+IMAPAccount gmail
+Host imap.gmail.com
+User jesterpm@gmail.com
+PassCmd "imap-pass -g jesterpm@gmail.com"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore gmail-remote
+Account gmail
+
+MaildirStore gmail-local
+Path ~/.maildir/
+Inbox ~/.maildir/INBOX
+
+Channel sync-gmail-default
+Master :gmail-remote:
+Slave :gmail-local:
+Patterns "INBOX"
+Expunge Both
+Create Slave
+
+Channel sync-gmail-sent
+Master :gmail-remote:"[Gmail]/Sent Mail"
+Slave :gmail-local:sent
+Expunge Both
+Create Slave
+
+Channel sync-gmail-trash
+Master :gmail-remote:"[Gmail]/Bin"
+Slave :gmail-local:trash
+Expunge Both
+Create Slave
+
+Channel sync-gmail-drafts
+Master :gmail-remote:"[Gmail]/Drafts"
+Slave :gmail-local:drafts
+Expunge Both
+Create Slave
+
+Channel sync-gmail-archive
+Master :gmail-remote:"[Gmail]/All Mail"
+Slave :gmail-local:archive
+Expunge Both
+Create Slave
+
+Channel sync-gmail-spam
+Master :gmail-remote:"[Gmail]/Spam"
+Slave :gmail-local:spam
+Expunge Both
+Create Slave
+
+Group gmail
+Channel sync-gmail-default
+Channel sync-gmail-sent
+Channel sync-gmail-trash
+Channel sync-gmail-drafts
+Channel sync-gmail-archive
+Channel sync-gmail-spam
diff --git a/host-overrides/jesterpm.net/msmtprc b/host-overrides/jesterpm.net/msmtprc
new file mode 100644
index 0000000..809766e
--- /dev/null
+++ b/host-overrides/jesterpm.net/msmtprc
@@ -0,0 +1,9 @@
+account default
+from jesse@jesterpm.net
+host smtp.jesterpm.net
+auth on
+user jesse@jesterpm.net
+tls
+tls_starttls off
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile ~/.msmtp.log
-- 
cgit v1.2.3