[24070] in Source-Commits
/svn/athena r23674 - trunk/debathena/config/alpine-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Mar 30 09:00:32 2009
Date: Mon, 30 Mar 2009 09:00:17 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903301300.n2UD0HuR007927@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-30 09:00:17 -0400 (Mon, 30 Mar 2009)
New Revision: 23674
Modified:
trunk/debathena/config/alpine-config/debian/changelog
trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
Log:
In alpine-config:
* Try ATHENA_USER, then USER for the username to use when doing the
Hesiod lookup and conncting to the mail server.
Modified: trunk/debathena/config/alpine-config/debian/changelog
===================================================================
--- trunk/debathena/config/alpine-config/debian/changelog 2009-03-30 00:14:19 UTC (rev 23673)
+++ trunk/debathena/config/alpine-config/debian/changelog 2009-03-30 13:00:17 UTC (rev 23674)
@@ -1,3 +1,10 @@
+debathena-alpine-config (1.7) unstable; urgency=low
+
+ * Try ATHENA_USER, then USER for the username to use when doing the
+ Hesiod lookup and conncting to the mail server.
+
+ -- Evan Broder <broder@mit.edu> Mon, 30 Mar 2009 09:00:08 -0400
+
debathena-alpine-config (1.6) unstable; urgency=low
* Add back missing trailing commas in feature-list.
Modified: trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
===================================================================
--- trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-03-30 00:14:19 UTC (rev 23673)
+++ trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-03-30 13:00:17 UTC (rev 23674)
@@ -1,7 +1,7 @@
#!/usr/bin/perl -0p
s#^(user-domain=).*$#${1}mit.edu#m or die;
s#^(nntp-server=).*$#${1}news.mit.edu#m or die;
-s#^(inbox-path=).*$#${1}{mit.edu/hesiod/imap}INBOX#m or die;
+s#^(inbox-path=).*$#${1}{mit.edu/hesiod/imap/user=\${ATHENA_USER:-\$USER}}}INBOX#m or die;
s#^(feature-list=).*$#${1}enable-mail-check-cue,\n\tsave-will-quote-leading-froms,\n\tenable-full-header-cmd#m or die;
s#^(bugs-fullname=).*$#${1}Athena Bugs#m or die;
s#^(bugs-address=).*$#${1}bugs\@mit.edu#m or die;
@@ -10,7 +10,7 @@
s#^(local-fullname=).*$#${1}Athena Consultants#m or die;
s#^(local-address=).*$#${1}olc-mail\@mit.edu#m or die;
s#^(url-viewers=).*$#${1}/usr/bin/sensible-browser#m or die;
-s#^(folder-collections=).*$#${1}"MIT Mail" {mit.edu/hesiod/imap}INBOX.[]#m or die;
+s#^(folder-collections=).*$#${1}"MIT Mail" {mit.edu/hesiod/imap/user=\${ATHENA_USER:-\$USER}}}INBOX.[]#m or die;
s#^(sendmail-path=).*$#${1}/usr/lib/debathena-msmtp -t#m or die;
s#^(rsh-open-timeout=).*$#${1}0#m or die;
s#^(ssh-open-timeout=).*$#${1}0#m or die;
