[23908] in Source-Commits
/svn/athena r23518 - trunk/debathena/debathena/counterlog/debian
daemon@ATHENA.MIT.EDU (Timothy G Abbott)
Wed Mar 4 01:32:11 2009
Date: Wed, 4 Mar 2009 01:31:49 -0500
From: Timothy G Abbott <tabbott@MIT.EDU>
Message-Id: <200903040631.n246VnSF001521@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2009-03-04 01:31:48 -0500 (Wed, 04 Mar 2009)
New Revision: 23518
Modified:
trunk/debathena/debathena/counterlog/debian/changelog
trunk/debathena/debathena/counterlog/debian/debathena-counterlog.cron.daily
Log:
In counterlog:
* Use wslogger.mit.edu as the log host unconditionally.
Modified: trunk/debathena/debathena/counterlog/debian/changelog
===================================================================
--- trunk/debathena/debathena/counterlog/debian/changelog 2009-03-04 04:32:57 UTC (rev 23517)
+++ trunk/debathena/debathena/counterlog/debian/changelog 2009-03-04 06:31:48 UTC (rev 23518)
@@ -1,3 +1,9 @@
+debathena-counterlog (1.2) unstable; urgency=low
+
+ * Use wslogger.mit.edu as the log host unconditionally.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 04 Mar 2009 01:30:50 -0500
+
debathena-counterlog (1.1) unstable; urgency=low
* Add a copyright file.
Modified: trunk/debathena/debathena/counterlog/debian/debathena-counterlog.cron.daily
===================================================================
--- trunk/debathena/debathena/counterlog/debian/debathena-counterlog.cron.daily 2009-03-04 04:32:57 UTC (rev 23517)
+++ trunk/debathena/debathena/counterlog/debian/debathena-counterlog.cron.daily 2009-03-04 06:31:48 UTC (rev 23518)
@@ -15,28 +15,8 @@
echo "$id" > $idfile
fi
-# Determine if this is an Athena 10 or Debathena machine.
-slist=/etc/apt/sources.list.d/debathena.list
-if [ ! -r $slist ]; then
- slist=/etc/apt/sources.list
-fi
-aptloc=$(awk '/^deb .* debathena.*/ {print $2}' $slist)
-case $aptloc in
-*//athena10.mit.edu/*)
- version=athena10
- loghost=wslogger.mit.edu
- ;;
-*//debathena.mit.edu/*)
- # SIPB does not currently have a log host set up. Change this block
- # if it sets one up and wants counter logs.
- version=debathena
- exit
- ;;
-*)
- exit
- ;;
-esac
-
+version=debathena
+loghost=wslogger.mit.edu
host=$(hostname --fqdn)
mtype=$(machtype)
ctype=$(machtype -c)
