Ignore:
Timestamp:
Jul 31, 2011, 12:32:31 AM (11 years ago)
Author:
achernya
Message:
Merge r1878-r1937 from trunk to branches/fc15-dev
Location:
branches/fc15-dev
Files:
4 deleted
15 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev

  • branches/fc15-dev/locker

  • branches/fc15-dev/locker/bin

  • branches/fc15-dev/locker/bin/cronload

    r463 r1938  
    11#!/bin/sh
     2
     3usage="Usage \"$0 [-l lockername] [-h] crontab\""
     4while getopts "l:h" options; do
     5    case $options in
     6        l ) lname=$OPTARG;;
     7        h ) echo "$usage"; exit 0;;
     8        * ) echo "$usage"; exit 1;;
     9    esac
     10done
     11shift `expr $OPTIND - 1`
     12if [ -z "$1" ]; then
     13    echo "$usage"
     14    exit 1
     15fi
    216
    317echo "This program should print your new crontab below."
     
    620echo
    721
     22
    823cwd=`pwd`
    9 lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
     24if [ -z "$lname" ]; then
     25    lname=`perl -e "\\\$temp = \"$cwd\"; \\\$temp =~ /\\\/([^\\\/]+)\\\/cron_scripts/; print \\\$1"`
     26fi
     27if [ -z "$lname" ]; then
     28    echo "ERROR: Could not detect locker name. Make sure to run"
     29    echo "cronload from within /mit/lockername/cron_scripts/"
     30    echo "(or pass the -l lockername option)"
     31    exit 1
     32fi
    1033athrun scripts scripts-ssh "$lname" /usr/local/bin/cronload "$1" "$cwd" 2>/dev/null
     34if ! grep -q "^MAILTO=" "$1"; then
     35    echo "WARNING: You have no MAILTO= variable set. This means any"
     36    echo "cron errors will go to $lname@scripts.mit.edu (your mail_scripts"
     37    echo "account), which is almost certainly not what you want!"
     38    echo "Please add a MAILTO= line, e.g., MAILTO=${EMAIL:-${ATHENA_USER:-$USER}@mit.edu},"
     39    echo "to your crontab. If you do not want to receive errors, set"
     40    echo 'MAILTO="".'
     41fi
  • branches/fc15-dev/locker/bin/crontab

    r1515 r1938  
    99# (can be useful for debugging)
    1010# You can always redirect the output of individual commands to /dev/null
    11 MAILTO="SCRIPTS_USER@mit.edu"
     11MAILTO="ATHENA_USER@mit.edu"
    1212# If you do not want to receive any mail from cron, use the line below instead
    1313#MAILTO=""
     
    2222#  | | | | |
    2323#  | | | | ----- day of week (0 - 6) (Sunday=0)
    24 #  | |  | ------- month (1 - 12)
     24#  | | | ------- month (1 - 12)
    2525#  | | --------- day of month (1 - 31)
    2626#  | ----------- hour (0 - 23)
  • branches/fc15-dev/locker/bin/scripts-mediawiki

    r1404 r1938  
    22
    33sname="MediaWiki"
    4 deploy="mediawiki$scriptsstar"
     4deploy="mediawiki"
    55prompt_username=1
    66wizard="mediawiki"
    7 . /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
     7. /mit/scripts/deploy$scriptsdev/bin/onathena
  • branches/fc15-dev/locker/bin/scripts-remove

    • Property svn:mergeinfo deleted
  • branches/fc15-dev/locker/bin/scripts-ssh

    r1404 r1938  
    99        -o PreferredAuthentications=gssapi-with-mic \
    1010        -o ForwardX11=no \
    11         -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
     11        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
    1212        -o UserKnownHostsFile=/dev/null \
    1313        -t \
  • branches/fc15-dev/locker/bin/scripts-start

    • Property svn:mergeinfo deleted
    r1878 r1938  
    66    echo 'gallery2 Gallery2'
    77    echo 'phpbb phpBB'
    8     echo 'phpical PHP iCalendar'
     8    echo 'joomla Joomla'
     9    echo 'git Git repository'
    910    echo 'trac Trac'
    10     echo 'joomla Joomla'
    1111    echo 'turbogears TurboGears'
    1212    echo 'django Django'
  • branches/fc15-dev/locker/bin/scripts-wordpress

    r1404 r1938  
    22
    33sname="WordPress"
    4 deploy="wordpress$scriptsstar"
     4deploy="wordpress"
    55prompt_password=0
    66wizard="wordpress"
    7 . /mit/scripts/deploy$scriptsdev/bin/onathena$scriptsstar
     7. /mit/scripts/deploy$scriptsdev/bin/onathena
  • branches/fc15-dev/locker/bin/signup-cron

    r1087 r1938  
    1010  fs sa /mit/$lname/cron_scripts daemon.scripts write
    1111  DATE=`date`
    12   sed '/SCRIPTS_USER/s//'"$lname"'/g' /mit/scripts/deploy/crontab | sed '/SCRIPTS_DATE/s//'"$DATE"'/g' > /mit/$lname/cron_scripts/crontab
     12  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
     13  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
     14  echo "By default, output from cron jobs for the $lname locker will be mailed"
     15  echo "to $signupuser@mit.edu.  You should edit /mit/$lname/cron_scripts/crontab"
     16  echo "to change this and set up your cron jobs."
    1317  success "the cron script service" "The directory /mit/$lname/cron_scripts has been created."
    1418else
  • branches/fc15-dev/locker/bin/signup-mail

    r1087 r1938  
    99  fs sa /mit/$lname/mail_scripts system:authuser none
    1010  fs sa /mit/$lname/mail_scripts daemon.scripts read
    11   signupuser=`echo "$principal" | sed 's/@.*$//'`
     11  signupuser=`echo "$principal" | sed 's/[/@].*$//'`
    1212  sed /SCRIPTS_USER/s//$signupuser/ /mit/scripts/bin/procmailrc > /mit/$lname/mail_scripts/procmailrc
    1313  echo "By default, mail sent to $lname@scripts.mit.edu will be forwarded to"
  • branches/fc15-dev/locker/bin/signup-minimal

    • Property svn:mergeinfo deleted
  • branches/fc15-dev/locker/bin/signup-sql

    • Property svn:mergeinfo deleted
  • branches/fc15-dev/locker/bin/ssh

    r793 r1938  
    1111        -o PreferredAuthentications=gssapi-with-mic \
    1212        -o ForwardX11=no \
    13         -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ssh/known_hosts \
     13        -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \
    1414        -o UserKnownHostsFile=/dev/null \
    1515        "$@"
Note: See TracChangeset for help on using the changeset viewer.