Changeset 1521 for branches

Timestamp:

Mar 26, 2010, 6:21:51 AM (13 years ago)

Author:

mitchb

Message:

Send cronjob mail to the user who signed up a locker by default

Previously, we set up crontabs to send mail to lockername@mit.edu.
This was fine when scripts didn't support non-user lockers.  It's
not necessarily a fine assumption in the case of group lockers that
the address is appropriate (or even exists).  We could send mail
to the scripts user, but that only works if the user is signed up
for mail_scripts.  Instead, we'll default it to the user who signed
the locker up for cron_scripts (the same logic mail_scripts uses
for the initial procmailrc) and tell them to change it if it should
go elsewhere when they set up their crontab.

Also move the crontab template to bin instead of deploy so that it
can be under revision control.  Finally, correct a whitespace error
in the ASCII art (reported by kaduk).

Location:

branches/locker-dev/locker/bin

Files:

• crontab (modified) (2 diffs)
• signup-cron (modified) (1 diff)

branches/locker-dev/locker/bin/crontab

@@ -9 +9 @@
 # (can be useful for debugging)
 # You can always redirect the output of individual commands to /dev/null
-MAILTO="SCRIPTS_USER@mit.edu"
+MAILTO="ATHENA_USER@mit.edu"
 # If you do not want to receive any mail from cron, use the line below instead
 #MAILTO=""
@@ -22 +22 @@
 #  | | | | |
 #  | | | | ----- day of week (0 - 6) (Sunday=0)
-#  | |  | ------- month (1 - 12)
+#  | | | ------- month (1 - 12)
 #  | | --------- day of month (1 - 31)
 #  | ----------- hour (0 - 23)

branches/locker-dev/locker/bin/signup-cron

@@ -10 +10 @@
   fs sa /mit/$lname/cron_scripts daemon.scripts write
   DATE=`date`
-  sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/deploy/crontab | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
+  signupuser=`echo "$principal" | sed 's/@.*$//'`
+  sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/bin$scriptsdev/crontab | sed '/ATHENA_USER/s//'"$signupuser"'/g' | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
+  echo "By default, output from cron jobs for the $lname locker will be mailed"
+  echo "to $signupuser@mit.edu.  You should edit /mit/$lname/cron_scripts/crontab"
+  echo "to change this and set up your cron jobs."
   success "the cron script service" "The directory /mit/$lname/cron_scripts has been created."
 else