X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2173cedecabfebfb806c4576c230b1be2257000c..2dca731ae97e1172236269d261f6af10bba62df8:/dot/gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index a05ed7b..c208d0f 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -5,13 +5,13 @@
 ;;; (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
@@ -144,6 +144,7 @@
 	  (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")
@@ -214,6 +215,7 @@
 (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)
@@ -221,6 +223,7 @@
 		(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)
@@ -228,6 +231,7 @@
 		(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)
@@ -235,6 +239,7 @@
 		(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)