[28830] in Source-Commits
moira commit [debian]: Replace deprecated /etc/athena paths
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Apr 25 23:50:01 2018
Date: Wed, 25 Apr 2018 23:49:56 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201804260349.w3Q3nue1024926@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/15d3eb09e7e279e47a79d0966b0f3363f74d09ed
commit 15d3eb09e7e279e47a79d0966b0f3363f74d09ed
Author: Jonathon Weiss <jweiss@mit.edu>
Date: Fri Jun 2 18:23:41 2017 -0400
Replace deprecated /etc/athena paths
moira/gen/zephyr.sh | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/moira/gen/zephyr.sh b/moira/gen/zephyr.sh
index 778a19c..b844dc0 100644
--- a/moira/gen/zephyr.sh
+++ b/moira/gen/zephyr.sh
@@ -16,13 +16,14 @@ MR_TARERR=47836476
hup=no
PATH=/bin
TARFILE=/var/tmp/zephyr.out
+ZEPHYRETC=/usr/local/etc/zephyr
# Alert if the tar file does not exist
test -r $TARFILE || exit $MR_MISSINGFILE
# Make a temporary directory to unpack the tar file into
-mkdir /etc/athena/zephyr/acl.new
-cd /etc/athena/zephyr/acl.new || exit $MR_MKCRED
+mkdir $ZEPHYRETC/acl.new
+cd $ZEPHYRETC/acl.new || exit $MR_MKCRED
tar xf $TARFILE || exit $MR_TARERR
# Copy over each file which is new or has changed
@@ -49,7 +50,7 @@ yes)
esac
# cleanup
-rm -rf /etc/athena/zephyr/acl.new
+rm -rf $ZEPHYRETC/acl.new
test -f $TARFILE && rm -f $TARFILE
test -f $0 && rm -f $0
