X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5e504acc7931c1abf3bb487d4137158ba4196f5e..b76d1b814f813f9d5e692e002b1c8f644b79bc14:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 02dea2e..ed32911 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -18,6 +18,16 @@
 	   '(("mail.distorted.org.uk" 587 "" ""))))
 
 ;;;--------------------------------------------------------------------------
+;;; 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.
 
 ;; Read mail on the IMAP server.
@@ -26,6 +36,10 @@
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
 		(nnimap-authinfo-file "~/.gnus.authinfo"))
+	(nnimap "markw-distorted"
+		(nnimap-address "mail.distorted.org.uk")
+		(nnimap-stream tls)
+		(nnimap-authinfo-file "~/.gnus.authinfo.markw"))
 	(nnimap "google"
 		(nnimap-address "imap.gmail.com")
 		(nnimap-stream tls)
@@ -54,13 +68,7 @@
       "^nnimap\\+distorted:\\(crap\\|spam\\|admin\\|lists\\|nag\\)\\..*")
 
 ;; My various email addresses.
-(setq message-alternative-emails
-      (concat "^"
-	      "\\(" "\\(mdw\\|markw\\|postmaster\\)"
-		    "\\([-+][^@]*\\|\\)"
-		    "@\\(distorted\\.org\\.uk\\|escorted\\.org\\.uk\\|odin\\.gg\\)"
-	      "\\|" "distorted\\.mdw@g\\(oogle\\|\\)mail\\.com"
-	      "\\)$")
+(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.
@@ -106,6 +114,9 @@
 	  (from "\\(sealbot\\|cardbot\\)@ncipher\\.com" "nag.cardbot")
 	  (from "\\<mailman-owner@" "nag.mailman" t)
 
+	  ;; 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)