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

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 82cc344..7407e89 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -56,26 +56,23 @@
 (setq gnus-secondary-select-methods
       '((nnimap "distorted"
 		(nnimap-address "mail.distorted.org.uk")
-		(nnimap-stream tls)
-		(nnimap-authinfo-file "~/.gnus.authinfo")
+		(nnimap-stream starttls)
 		(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-stream starttls)
 		(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-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)))))
 
@@ -135,6 +132,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.