Changeset 1938 for branches/fc15-dev/locker/bin

Timestamp:

Jul 31, 2011, 12:32:31 AM (13 years ago)

Author:

achernya

Message:

Merge r1878-r1937 from trunk to branches/fc15-dev

Location:

branches/fc15-dev

Files:

• . (modified) (1 prop)
• locker (modified) (1 prop)
• locker/bin (modified) (1 prop)
• locker/bin/cronload (modified) (2 diffs)
• locker/bin/crontab (modified) (2 diffs)
• locker/bin/for-each-server (copied) (copied from trunk/locker/bin/for-each-server)
• locker/bin/scripts-advancedbook (deleted)
• locker/bin/scripts-advancedpoll (deleted)
• locker/bin/scripts-e107 (deleted)
• locker/bin/scripts-git (copied) (copied from trunk/locker/bin/scripts-git)
• locker/bin/scripts-mediawiki (modified) (1 diff)
• locker/bin/scripts-phpical (deleted)
• locker/bin/scripts-rails (copied) (copied from trunk/locker/bin/scripts-rails)
• locker/bin/scripts-remove (modified) (1 prop)
• locker/bin/scripts-ssh (modified) (1 diff)
• locker/bin/scripts-start (modified) (1 diff, 1 prop)
• locker/bin/scripts-wordpress (modified) (1 diff)
• locker/bin/signup-cron (modified) (1 diff)
• locker/bin/signup-mail (modified) (1 diff)
• locker/bin/signup-minimal (modified) (1 prop)
• locker/bin/signup-sql (modified) (1 prop)
• locker/bin/ssh (modified) (1 diff)

branches/fc15-dev/locker/bin/cronload

@@ -1 +1 @@
 #!/bin/sh
+
+usage="Usage \"$0 [-l lockername] [-h] crontab\""
+while getopts "l:h" options; do
+    case $options in 
+        l ) lname=$OPTARG;;
+        h ) echo "$usage"; exit 0;;
+        * ) echo "$usage"; exit 1;;
+    esac
+done
+shift `expr $OPTIND - 1`
+if [ -z "$1" ]; then
+    echo "$usage"
+    exit 1
+fi
 
 echo "This program should print your new crontab below."
@@ -6 +20 @@
 echo
 
+
 cwd=`pwd`
-lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
+if [ -z "$lname" ]; then
+    lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
+fi
+if [ -z "$lname" ]; then
+    echo "ERROR: Could not detect locker name. Make sure to run"
+    echo "cronload from within /mit/lockername/cron_scripts/"
+    echo "(or pass the -l lockername option)"
+    exit 1
+fi
 athrun scripts scripts-ssh "$lname" /usr/local/bin/cronload "$1" "$cwd" 2>/dev/null
+if ! grep -q "^MAILTO=" "$1"; then
+    echo "WARNING: You have no MAILTO= variable set. This means any"
+    echo "cron errors will go to $lname@scripts.mit.edu (your mail_scripts"
+    echo "account), which is almost certainly not what you want!"
+    echo "Please add a MAILTO= line, e.g., MAILTO=${EMAIL:-${ATHENA_USER:-$USER}@mit.edu},"
+    echo "to your crontab. If you do not want to receive errors, set"
+    echo 'MAILTO="".'
+fi

branches/fc15-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/fc15-dev/locker/bin/scripts-mediawiki

@@ -2 +2 @@
 
 sname="MediaWiki"
-deploy="mediawiki$scriptsstar"
+deploy="mediawiki"
 prompt_username=1
 wizard="mediawiki"
-. /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
+. /mit/scripts/deploy$scriptsdev/bin/onathena

branches/fc15-dev/locker/bin/scripts-ssh

@@ -9 +9 @@
         -o PreferredAuthentications=gssapi-with-mic \
         -o ForwardX11=no \
-        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
+        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
         -o UserKnownHostsFile=/dev/null \
         -t \

branches/fc15-dev/locker/bin/scripts-start

@@ -6 +6 @@
     echo 'gallery2 Gallery2'
     echo 'phpbb phpBB'
-    echo 'phpical PHP iCalendar'
+    echo 'joomla Joomla'
+    echo 'git Git repository'
     echo 'trac Trac'
-    echo 'joomla Joomla'
     echo 'turbogears TurboGears'
     echo 'django Django'

branches/fc15-dev/locker/bin/scripts-wordpress

@@ -2 +2 @@
 
 sname="WordPress"
-deploy="wordpress$scriptsstar"
+deploy="wordpress"
 prompt_password=0
 wizard="wordpress"
-. /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
+. /mit/scripts/deploy$scriptsdev/bin/onathena

branches/fc15-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

branches/fc15-dev/locker/bin/signup-mail

@@ -9 +9 @@
   fs sa /mit/$lname/mail_scripts system:authuser none
   fs sa /mit/$lname/mail_scripts daemon.scripts read
-  signupuser=`echo "$principal" | sed 's/@.*$//'`
+  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
   sed /SCRIPTS_USER/s//$signupuser/ /mit/scripts/bin/procmailrc > /mit/$lname/mail_scripts/procmailrc
   echo "By default, mail sent to $lname@scripts.mit.edu will be forwarded to"

branches/fc15-dev/locker/bin/ssh

@@ -11 +11 @@
         -o PreferredAuthentications=gssapi-with-mic \
         -o ForwardX11=no \
-        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
+        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
         -o UserKnownHostsFile=/dev/null \
         "$@"