;;; (c) 2014 Mark Wooding
;;;
+(setq auth-sources '("~/.gnus.authinfo"))
+
;;;--------------------------------------------------------------------------
;;; How to send mail.
-(and nil
- (setq smtpmail-smtp-server "mail.distorted.org.uk"
- smtpmail-sendto-domain "distorted.org.uk"
- smtpmail-smtp-service 587
- smtpmail-auth-credentials "~/.gnus.authinfo"
- message-send-mail-function 'smtpmail-send-it
- smtpmail-starttls-credentials
- '(("mail.distorted.org.uk" 587 "" ""))))
+(setq smtpmail-smtp-service 587
+ smtpmail-auth-credentials "~/.gnus.authinfo")
+
+(setq mdw-send-mail-alist
+ `((distorted-smtp
+ (send-mail-function . smtpmail-send-it)
+ (smtpmail-smtp-server . "mail.distorted.org.uk")
+ (smtpmail-starttls-credentials
+ ("mail.distorted.org.uk" 587 nil nil)))
+ (chiark-smtp
+ (send-mail-function . smtpmail-send-it)
+ (smtpmail-smtp-server . "smtp.dovecot.chiark.greenend.org.uk")
+ (starttls-extra-arguments "--insecure")
+ (smtpmail-starttls-credentials
+ ("smtp.dovecot.chiark.greenend.org.uk" 587 nil nil)))
+ (gmail-smtp
+ (send-mail-function . smtpmail-send-it)
+ (smtpmail-smtp-server . "smtp.gmail.com")
+ (smtpmail-starttls-credentials
+ ("smtp.gmail.com" 587 nil nil))))
+ mdw-guess-send-mail-alist
+ `((,(concat "@\\(" "\\(chiark\\|slimy\\|coriolis\\)"
+ "\\.greenend\\.org\\.uk"
+ "\\|" "evade\\.org\\.uk"
+ "\\|" "fyvzl\\.net"
+ "\\)$") . chiark-smtp)
+ ("@g\\(\\|oogle\\)mail\\.com$" . gmail-smtp))
+ mdw-default-send-mail-method nil)
+
+;;;--------------------------------------------------------------------------
+;;; News via chiark.
+
+;; Currently we assume an SSH tunnel. This will be fixed later.
+(setq gnus-select-method
+ '(nntp "chiark-ssh-kludge"
+ (nntp-open-connection-function nntp-open-authinfo-kludge)
+ (nntp-address "tunnel.chiark.greenend.org.uk")
+ (nntp-authinfo-generic "md5cookie1way mdw")))
;;;--------------------------------------------------------------------------
;;; Where we get mail from.
(setq gnus-secondary-select-methods
'((nnimap "distorted"
(nnimap-address "mail.distorted.org.uk")
+ (nnimap-stream starttls)
+ (nnimap-inbox "INBOX")
+ (nnimap-unsplittable-articles (%Deleted)))
+ (nnimap "markw-distorted"
+ (nnimap-address "mail.distorted.org.uk")
+ (nnimap-stream starttls)
+ (nnimap-inbox "INBOX")
+ (nnimap-unsplittable-articles (%Deleted)))
+ (nnimap "mwooding-chiark"
+ (nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+ (nnimap-stream starttls)
+ (starttls-extra-arguments ("--insecure"))
+ (nnimap-inbox "INBOX")
+ (nnimap-unsplittable-articles (%Deleted)))
+ (nnimap "google"
+ (nnimap-address "imap.gmail.com")
(nnimap-stream tls)
- (nnimap-authinfo-file "~/.gnus.authinfo"))))
+ (nnimap-inbox "INBOX")
+ (nnimap-unsplittable-articles (%Deleted)))))
;; Send sent mail back to me.
(setq gnus-message-archive-method "mail"
;; General splitting configuration.
(setq nnimap-split-inbox '("INBOX" "to.split")
nnimap-split-rule 'nnimap-split-fancy
- nnimap-split-crosspost t
+ nnimap-split-methods 'nnimap-split-fancy
+ nnmail-split-methods 'nnmail-split-fancy
nnimap-split-predicate "UNDELETED"
+ nnimap-split-crosspost t
+ nnmail-split-crosspost t
nnmail-split-fancy-match-partial-words nil)
;; Automatic expiry for particular groups.
(setq gnus-auto-expirable-newsgroups
- "^nnimap\\+distorted:\\(crap\\|spam\\|admin\\|lists\\|nag\\)\\..*")
+ (concat "^"
+ "\\(nnimap\\+[^:]+\\|nnvirtual\\):"
+ "\\(admin\\|crap\\|lists\\|nag\\|spam\\)\\."))
+
+;; My various email addresses.
+(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
- '(((and (string-match "^nnimap\\+distorted:crap\\.\\(.*\\)$"
- gnus-newsgroup-name)
- (setq mdw-from-address
- (replace-match "mdw-nospam-\\1@distorted.org.uk"
- nil nil gnus-newsgroup-name)))
- ("From" mdw-from-address))))
+ '(("^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"))))
;; The actual splitting rules.
-(setq nnimap-split-fancy
- '(| (to "\\<\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
- (to "\\<hostmaster@" "admin.dns" t)
- (to "\\<postmaster@" "admin.mail" t)
- (to "\\<\\(root\\|mirror\\|postgres\\|spamd\\)@" "admin.misc" t)
+(setq nnmail-split-fancy
+ '(|
+ ;; Administrative boxes.
+ (to "\\(root\\|postgres\\|ca\\|noc\\)@" "admin.misc" t)
+ (to "\\(jukebox\\|nobody\\|darchive\\)@" "admin.misc" t)
+ (to "\\(hostmaster\\)@" "admin.dns" t)
+ (to "\\(news\\|newsmaster\\|usenet\\)@" "admin.news" t)
+ (to "\\(postmaster\\|spamd\\|mailer-daemon\\)@" "admin.mail" t)
+ (to "\\(irc\\|blight\\|ircbot\\)@" "admin.irc" t)
+ (to "\\(www\\|webmaster\\|mtos\\)@" "admin.web" t)
+ (to "\\(ftp\\|ftpadmin\\|mirror\\)@" "admin.ftp" t)
+ (to "\\(abuse\\|security\\)@" "admin.keep" t)
+ (from "cron daemon" "admin.misc")
+ (from "uucp@distorted\\.org\\.uk" "admin.uucp")
+ (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+ (from "support@aa\\.net\\.uk" "admin.aaisp")
+ (from "bugs@distorted\\.org\\.uk" "admin.bugs")
+
+ ;; Colo provider.
+ (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")
+
+ ;; Mailing lists, not split out earlier.
(to "python-list@python\\.org" "lists.python")
+ (to "jump-announce@jump\\.net\\.uk" "lists.jump-announce")
+
+ ;; Per-sender addresses.
+ (to "mdw-nospam-justgviing@" "crap.justgiving" t)
(to "mdw-nospam-\\([^@]+\\)@" "crap.\\1" t)
- (from "support@jump\\.net\\.uk" "keep.colo")
+ (to "mdw-nopspam-\\([^@]+\\)@" "crap.\\1" t)
+
+ ;; Regular nags.
(from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
(from "\\<mailman-owner@" "nag.mailman" t)
- (from "cron daemon" "admin.misc")
- (from "uucp@distorted\\.org\\.uk" "admin.uucp")
- (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+
+ ;; Uninteresting mail.
+ (from "expiry@letsencrypt\\.org" "spam.letsencrypt" t)
+
+ ;; Other splits I've not given a per-sender address.
(from "@\\(.*\\.\\)?lovefilm\\.com" "spam.lovefilm" t)
(from "@amazon\\." "spam.amazon" t)
(from "@cineworldmail\\.com" "spam.cineworld" t)
(from "@action\\.openrightsgroup\\.org" "spam.org" t)
(from "unlimited@cineworld\\.com" "spam.cineworld" t)
(from "nationwide@securesuiteemail\\.com" "spam.nationwide" t)
+ (from "@liberty-human-rights\\.org\\.uk" "spam.liberty" t)
+ (from "@libertymail\\.org\\.uk" "spam.liberty" t)
+ (from "@openrightsgroup\\.org" "spam.org" t)
(from "@tshirthell\\.com" "spam.tshirt-hell" t)
- "mail.misc"))
+ (from "campaigns@jolla\\.com" "crap.jolla" t)
+
+ ;; Default.
+ "mail.misc")
+ nnimap-split-fancy nnmail-split-fancy)
;;;----- That's all, folks --------------------------------------------------
~mdw / profile / blobdiff