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

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 64dced6..175b443 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,17 +5,39 @@
 ;;; (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.
@@ -24,8 +46,8 @@
 (setq gnus-select-method
       '(nntp "chiark-ssh-kludge"
 	     (nntp-open-connection-function nntp-open-authinfo-kludge)
-	     (nntp-address "localhost:10119")
-	     (nntp-authinfo-generic "md5cookie1way chiark")))
+	     (nntp-address "tunnel.chiark.greenend.org.uk")
+	     (nntp-authinfo-generic "md5cookie1way mdw")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Where we get mail from.
@@ -35,15 +57,27 @@
       '((nnimap "distorted"
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo"))
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "markw-distorted"
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo.markw"))
+		(nnimap-authinfo-file "~/.gnus.authinfo.markw")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
+	(nnimap "mwooding-chiark"
+		(nnimap-address "imap.dovecot.chiark.greenend.org.uk")
+		(nnimap-stream tls)
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))
 	(nnimap "google"
 		(nnimap-address "imap.gmail.com")
 		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo"))))
+		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-inbox "INBOX")
+		(nnimap-unsplittable-articles (%Deleted)))))
 
 ;; Send sent mail back to me.
 (setq gnus-message-archive-method "mail"
@@ -65,7 +99,9 @@
 
 ;; 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
@@ -73,12 +109,15 @@
 
 ;; 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 nnmail-split-fancy
@@ -96,6 +135,7 @@
 	  (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.