[28364] in Source-Commits
alpine-config commit: Use chpobox and Hesiod to determine config
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 30 17:38:25 2014
Date: Wed, 30 Jul 2014 17:38:18 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407302138.s6ULcIKB020139@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/alpine-config/commit/5c6f252c767de2cb77de90992414766ccc727ee8
commit 5c6f252c767de2cb77de90992414766ccc727ee8
Author: Jonathan Reed <jdreed@mit.edu>
Date: Wed Jul 30 17:21:44 2014 -0400
Use chpobox and Hesiod to determine config
Hesiod information can lie for recently migrated people, and
the first 24 hours of this deployment suggests that nobody bothers
to read the text, so if they might be on Cyrus, check chpobox
(if possible) to see if they're secretly on Exchange
debian/alpine.debathena | 10 +++++++++-
debian/changelog | 6 ++++++
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/debian/alpine.debathena b/debian/alpine.debathena
index 47741b9..df1e066 100755
--- a/debian/alpine.debathena
+++ b/debian/alpine.debathena
@@ -7,7 +7,12 @@ arg=()
case "$(hesinfo "${ATHENA_USER:-$USER}" pobox 2>/dev/null | cut -d' ' -f2)" in
*EXCHANGE*) ;;
*)
- if ! [ -e "$FLAGFILE" ]; then
+ if ! [ -e "$FLAGFILE" ] && klist -s && \
+ type chpobox > /dev/null 2>&1 && \
+ chpobox | fgrep -q EXCHANGE.MIT.EDU; then
+ # They've been migrated, don't ask again
+ touch "$FLAGFILE"
+ elif ! [ -e "$FLAGFILE" ]; then
echo "Pine's default configuration has been updated to use"
echo "MIT's Exchange environment, but your account still"
echo "appears to be using the legacy Cyrus environment".
@@ -25,6 +30,9 @@ case "$(hesinfo "${ATHENA_USER:-$USER}" pobox 2>/dev/null | cut -d' ' -f2)" in
echo "In the future, when you are migrated to Exchange,"
echo "you must run the following command:"
echo "/usr/lib/debathena-alpine-config/update-pine-config exchange"
+ echo
+ echo "Press Enter to continue..."
+ read answer
;;
esac
touch "$FLAGFILE"
diff --git a/debian/changelog b/debian/changelog
index a1b9ac6..34be7a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debathena-alpine-config (1.21.1) unstable; urgency=low
+
+ * Use chpobox as well as Hesiod in the wrapper
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 30 Jul 2014 17:21:20 -0400
+
debathena-alpine-config (1.21) unstable; urgency=low
* Add "INBOX" to the end of the inbox-path for the Exchange
