X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/a27bd871cf9836792975ebd184289327b3fe9935..7f903e21a9d57c6e504c3bbf55dc5b31c041928c:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 4f6e014..e753bdf 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)
@@ -51,16 +65,12 @@
 
 ;; 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
-      (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.
@@ -88,6 +98,7 @@
 	  (from "cron daemon" "admin.misc")
 	  (from "uucp@distorted\\.org\\.uk" "admin.uucp")
 	  (from "darchive@.*\\.distorted\\.org\\.uk" "admin.misc")
+	  (from "bugs@distorted\\.org\\.uk" "admin.bugs")
 
 	  ;; Colo provider.
 	  (from "\\(accounts\\|support\\)@jump\\.net\\.uk" "keep.colo")
@@ -105,6 +116,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)