;;; (c) 2014 Mark Wooding
;;;
-(setq auth-sources '("~/.gnus.authinfo"))
+(setq auth-sources '("~/.authinfo.gpg"))
;;;--------------------------------------------------------------------------
;;; How to send mail.
(setq smtpmail-smtp-service 587
- smtpmail-auth-credentials "~/.gnus.authinfo")
+ smtpmail-auth-credentials "~/.authinfo.gpg")
(setq mdw-send-mail-alist
`((distorted-smtp
"\\|" "evade\\.org\\.uk"
"\\|" "fyvzl\\.net"
"\\)$") . chiark-smtp)
- ("@g\\(\\|oogle\\)mail\\.com$" . gmail-smtp))
+ ("@g\\(oogle\\)?mail\\.com$" . gmail-smtp))
mdw-default-send-mail-method nil)
;;;--------------------------------------------------------------------------
(setq message-alternative-emails bbdb-user-mail-names
message-dont-reply-to-names message-alternative-emails)
-;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
-(setq gnus-posting-styles
- '(("^nnimap\\+distorted:crap\\."
- (address (concat "mdw-nospam-"
- (substring gnus-newsgroup-name (match-end 0))
- "@distorted.org.uk")))
- ("^nnimap\\+[^:]+-chiark:"
- ("X-mdw-Send-Mail" "chiark-smtp"))
- ("^nnimap\\+google:"
- (address "distorted.mdw@gmail.com")
- ("X-mdw-Send-Mail" "gmail-smtp"))))
-
;; Augment Gnus's built-in header-list abbreviations.
(require 'nnmail)
(setq nnmail-split-abbrev-alist
"\\(" "$" "\\|" "\\s-" "\\)"))
(defvar mdw-odin-splits nil)
+(defvar mdw-odin-sender-alist nil)
(defun mdw-update-odin-info ()
- (let ((splits nil))
+ (let ((splits nil) (senders nil))
(with-temp-buffer
(call-process "ssh" nil t nil
"stratocaster" "userv" "odin" "mail" "list")
(tag (match-string 2)))
(push `(to ,(format "%s@odin\\.gg" local-part)
,(format "crap.%s" tag))
- splits)))
+ splits)
+ (push (cons tag local-part) senders)))
(forward-line)))
- (setq mdw-odin-splits (nreverse splits))))
+ (setq mdw-odin-splits (nreverse splits)
+ mdw-odin-sender-alist (nreverse senders))))
(mdw-update-odin-info)
+;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
+(setq gnus-posting-styles
+ '(("^nnimap\\+distorted:crap\\."
+ (address (let* ((mailbox (substring gnus-newsgroup-name
+ (match-end 0)))
+ (entry (assoc mailbox mdw-odin-sender-alist)))
+ (if entry (concat (cdr entry) "@odin.gg")
+ (concat "mdw-nospam-" mailbox "@distorted.org.uk")))))
+ ("^nnimap\\+[^:]+-chiark:"
+ ("X-mdw-Send-Mail" "chiark-smtp"))
+ ("^nnimap\\+google:"
+ (address "distorted.mdw@gmail.com")
+ ("X-mdw-Send-Mail" "gmail-smtp"))))
+
;; The actual splitting rules.
(setq nnmail-split-fancy
`(|
(from "cron daemon" "admin.misc")
(from "uucp@distorted\\.org\\.uk" "admin.uucp")
(from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+ (from "sales@aa\\.net\\.uk" "admin.aaisp")
(from "support@aa\\.net\\.uk" "admin.aaisp")
(from "bugs@distorted\\.org\\.uk" "admin.bugs")
(from "darchive@distorted\\.org\\.uk" "admin.darchive")
;; Mailing lists, not split out earlier.
(to "python-list@python\\.org" "lists.python")
- (to ,(concat "\\(jump-\\(announce\\|discuss\\)\\)@"
- "\\(lists\\.\\|\\)" "jump\\.net\\.uk")
+ (to ,(concat "\\(jump-\\(announce\\|discuss\\|vps\\)\\)@"
+ "\\(lists\\.\\)?" "jump\\.net\\.uk")
"lists.\\1")
(to "cambridgecryptowhiskyclub@gmail\\.com"
"lists.cambridge-crypto-whisky")
(from "@warwick\\.ac\\.uk\\>" "lists.warwick-uni" t)
(to "chiark-\\(motd\\|announce\\)@chiark\\.greenend\\.org\\.uk"
"lists.chiark-announce")
+ (to "sot@dotat\\.at" "lists.sot" t)
(any "clive-cambridge-gamers@nsict\\.org" "lists.nsict-games")
;; Per-sender addresses.
(from "expiry@letsencrypt\\.org" "admin.letsencrypt")
;; Other splits I've not given a per-sender address.
- (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
- (from "@\\(\\|.*\\.\\)amazon\\." "crap.amazon" t)
+ (from "@\\([^.]+\\.\\)?aegon" "crap.aegon" t)
+ (from "@\\(.*\\.\\)?amazon\\." "crap.amazon" t)
+ (from "@\\(.*\\.\\)?primevideo\\." "crap.amazon" t)
(from "@cineworldmail\\.com\\>" "crap.cineworld" t)
- (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t)
- (from "@nationwide" "crap.nationwide" t)
- (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t)
- (from "@news\\.spotifymail\\.com\\>" "crap.spotify" t)
- (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t)
(from "unlimited@cineworld\\.com\\>" "crap.cineworld" t)
- (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t)
+ (from "@\\(.*\\.\\)?gandi\\.net\\>" "crap.gandi" t)
+ (from "@accounts\\.google\\.com\\>" "crap.google" t)
(from "campaigns@jolla\\.com\\>" "crap.jolla" t)
+ (from "@\\(.*\\.\\)?lovefilm\\.com\\>" "crap.lovefilm" t)
+ (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
+ (from "@\\([^.]+\\.\\)?nationwide" "crap.nationwide" t)
+ (from "nationwide@securesuiteemail\\.com\\>" "crap.nationwide" t)
+ (from "@action\\.openrightsgroup\\.org\\>" "crap.org" t)
+ (from "@picturehouses\\.co\\.uk\\>" "crap.picturehouse" t)
+ (from "@\\(.*\\.\\)?spotify\\(mail\\)?\\.com\\>" "crap.spotify" t)
(from "@thomann\\.de\\>" "crap.thomann" t)
+ (from "@tshirthell\\.com\\>" "crap.tshirt-hell" t)
(from "@wikimedia\\.org\\>" "crap.wikimedia" t)
- (from "@gandi\\.net\\>" "crap.gandi" t)
- (from "@mythic-beasts\\.com\\>" "crap.mythic-beasts" t)
;; Default.
"mail.misc"))
(setq gnus-secondary-select-methods
`((nnimap "distorted"
(nnimap-address "mail.distorted.org.uk")
+ (nnimap-user "mdw")
(nnimap-stream starttls)
(nnimap-inbox ("INBOX" "to.split"))
(nnimap-split-methods nnimap-split-fancy)
(nnimap-unsplittable-articles (%Deleted)))
(nnimap "markw-distorted"
(nnimap-address "mail.distorted.org.uk")
+ (nnimap-user "markw")
(nnimap-stream starttls)
(nnimap-inbox ("INBOX" "to.split"))
(nnimap-split-methods nnimap-split-fancy)
(nnimap-unsplittable-articles (%Deleted)))
(nnimap "mdw-chiark"
(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+ (nnimap-user "mdw")
(nnimap-stream starttls)
(nnimap-inbox ("INBOX" "to.split"))
(nnimap-split-methods nnimap-split-fancy)
(nnimap-unsplittable-articles (%Deleted)))
(nnimap "mwooding-chiark"
(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+ (nnimap-user "mwooding")
(nnimap-stream starttls)
(nnimap-inbox ("INBOX" "to.split"))
(nnimap-split-methods nnimap-split-fancy)
~mdw / profile / blobdiff