dot/ercrc.el: Remove IRC servers I can't talk to any more.

[profile] / dot / gnus-local.el.distorted

diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index ed32911cd967a5a66186daba4b3a543238d3ebb3..7407e89403a98871bd15a6d38e33221570623fe0 100644 (file)
--- 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.
@@ -34,16 +56,25 @@
 (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 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)))))
 
 ;; Send sent mail back to me.
 (setq gnus-message-archive-method "mail"
@@ -65,7 +96,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 +106,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 +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.