Changeset 1901


Ignore:
Timestamp:
Jun 11, 2011, 11:21:38 PM (11 years ago)
Author:
adehnert
Message:
Merge locker-dev to trunk
Location:
trunk/locker
Files:
21 edited
7 copied

Legend:

Unmodified
Added
Removed
  • trunk/locker

  • trunk/locker/bin

  • trunk/locker/bin/cronload

    r463 r1901  
    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
  • trunk/locker/bin/crontab

    r1515 r1901  
    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)
  • trunk/locker/bin/scripts-mediawiki

    r1404 r1901  
    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
  • trunk/locker/bin/scripts-remove

    • Property svn:mergeinfo deleted
  • trunk/locker/bin/scripts-start

    • Property svn:mergeinfo deleted
  • trunk/locker/bin/scripts-wordpress

    r1404 r1901  
    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
  • trunk/locker/bin/signup-cron

    r1087 r1901  
    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
  • trunk/locker/bin/signup-mail

    r1087 r1901  
    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"
  • trunk/locker/bin/signup-minimal

    • Property svn:mergeinfo deleted
  • trunk/locker/bin/signup-sql

    • Property svn:mergeinfo deleted
  • trunk/locker/deploy/bin

  • trunk/locker/deploy/bin/django

    r1775 r1901  
    3939print HTACCESS <<EOF;
    4040RewriteEngine On
     41
     42RewriteRule ^\$ index.fcgi/ [QSA,L]
     43
    4144RewriteCond %{REQUEST_FILENAME} !-f
    4245RewriteCond %{REQUEST_FILENAME} !-d
     
    4750
    4851chdir "/mit/$USER/Scripts/django/";
    49 system qw{django-admin startproject}, $name;
     52system(qw{django-admin startproject}, $name)==0 or die "\nFailed to create app.\n\n";
    5053chdir "$name";
    5154
  • trunk/locker/deploy/bin/onathena

    r1693 r1901  
    6262echo
    6363echo "Please report problems with this installer to $aicontact."
    64 echo
    65 echo "Are you performing this install for:"
    66 echo "1. Your personal Athena account"
    67 echo "2. A locker that you control (a club, a course, etc)"
    68 echo "If you do not understand this question, you should answer '1'."
    69 printf "Please enter either '1' or '2' (without quotes): "
    70 read whofor
    71 if [ "$whofor" = 1 ]; then
    72     lname="${ATHENA_USER:-$USER}"
    73 elif [ "$whofor" = 2 ]; then
    74     echo
    75     echo "OK.  $sname will be installed into a locker of your choice that"
    76     echo "you control.  Please enter the name of the selected locker below."
    77     echo "(For the locker /mit/lsc -- which has a full path of"
    78     echo "/afs/athena.mit.edu/activity/l/lsc -- you would simply enter lsc)."
    79     printf "Locker name: "
    80     read lname
     64
     65if [ -n "$SCRIPTS_INSTALL_LOCKER" ]; then
     66    lname=$SCRIPTS_INSTALL_LOCKER
    8167else
    8268    echo
    83     echo "ERROR:"
    84     echo "You must select either '1' or '2'."
    85     exit 1
    86 fi
    87 while true; do
    88     if attach "$lname"; then
    89         break
    90     fi
    91     echo "$lname is not a valid locker name."
    92     printf "Locker name: "
    93     read lname
    94 done
     69    echo "Are you performing this install for:"
     70    echo "1. Your personal Athena account"
     71    echo "2. A locker that you control (a club, a course, etc)"
     72    echo "If you do not understand this question, you should answer '1'."
     73    printf "Please enter either '1' or '2' (without quotes): "
     74    read whofor
     75    if [ "$whofor" = 1 ]; then
     76        lname="${ATHENA_USER:-$USER}"
     77    elif [ "$whofor" = 2 ]; then
     78        echo
     79        echo "OK.  $sname will be installed into a locker of your choice that"
     80        echo "you control.  Please enter the name of the selected locker below."
     81        echo "(For the locker /mit/lsc -- which has a full path of"
     82        echo "/afs/athena.mit.edu/activity/l/lsc -- you would simply enter lsc)."
     83        printf "Locker name: "
     84        read lname
     85    else
     86        echo
     87        echo "ERROR:"
     88        echo "You must select either '1' or '2'."
     89        exit 1
     90    fi
     91    while true; do
     92        if attach "$lname"; then
     93            break
     94        fi
     95        echo "$lname is not a valid locker name."
     96        printf "Locker name: "
     97        read lname
     98    done
     99    unset whofor
     100fi
    95101lroot="/mit/$lname"
    96102
     
    101107. "/mit/scripts/bin$scriptsdev/signup-web"
    102108
    103 echo
    104 echo "Your new copy of $sname will appear on the web at a URL"
    105 echo "that starts with http://$lname.scripts.mit.edu/"
    106 echo "Please decide upon a complete URL and enter it below."
    107 echo "You must enter one or more characters after mit.edu/"
    108 echo "The completed address must only contain a-z, 0-9, and /."
    109 printf "Desired address: http://$lname.scripts.mit.edu/"
    110 read addrend
     109if [ -n "$SCRIPTS_INSTALL_ADDREND" ]; then
     110    addrend=$SCRIPTS_INSTALL_ADDREND
     111else
     112    echo
     113    echo "Your new copy of $sname will appear on the web at a URL"
     114    echo "that starts with http://$lname.scripts.mit.edu/"
     115    echo "Please decide upon a complete URL and enter it below."
     116    echo "You must enter one or more characters after mit.edu/"
     117    echo "The completed address must only contain a-z, 0-9, and /."
     118    printf "Desired address: http://$lname.scripts.mit.edu/"
     119    read addrend
     120fi
    111121
    112122addrend=`perl -0e 'print $ARGV[0] =~ /^([\w\/-]*[\w-])\/*$/' -- "$addrend"`
     
    209219
    210220if [ "$wizard" != "" ]; then
    211   vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
     221  if [ "$create_scripts_dir" -eq 1 ]; then
     222    vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "--web-stub-path" "$lroot/web_scripts/$addrend" "$@" "$wizard" "$lroot/Scripts/$deploy/$addrend"
     223  else
     224    vsshrun "/mit/$ailocker/wizard/bin/wizard" "install" "$@" "$wizard" "$lroot/web_scripts/$addrend"
     225  fi
    212226  exit 0
    213227fi
  • trunk/locker/deploy/bin/onserver.pm

    r1217 r1901  
    1111use URI;
    1212our @ISA = qw(Exporter);
    13 our @EXPORT = qw(setup totmp fetch_uri print_login_info press_enter $server $tmp $USER $HOME $sname $deploy $addrend $base_uri $ua $admin_username $requires_sql $addrlast $sqlhost $sqluser $sqlpass $sqldb $admin_password $scriptsdev $human $email);
     13our @EXPORT = qw(setup totmp fetch_uri print_login_info press_enter $server $tmp $USER $HOME $scriptsdir $sname $deploy $addrend $base_uri $ua $admin_username $requires_sql $addrlast $sqlhost $sqluser $sqlpass $sqldb $admin_password $scriptsdev $human $email);
    1414
    1515our $server = "scripts.mit.edu";
    1616
    17 our ($tmp, $USER, $HOME, $sname, $deploy, $addrend, $base_uri, $ua, $admin_username, $requires_sql, $addrlast, $sqlhost, $sqluser, $sqlpass, $sqldb, $admin_password, $scriptsdev, $human, $email);
     17our ($tmp, $USER, $HOME, $scriptsdir, $sname, $deploy, $addrend, $base_uri, $ua, $admin_username, $requires_sql, $addrlast, $sqlhost, $sqluser, $sqlpass, $sqldb, $admin_password, $scriptsdev, $human, $email);
    1818
    1919$tmp = ".scripts-tmp";
     
    7777  $USER = $ENV{USER};
    7878  $HOME = $ENV{HOME};
     79  $scriptsdir = $HOME;
     80  $scriptsdir =~ s/\/Scripts$//;
     81  $scriptsdir .= "/Scripts";
    7982 
    8083  ($sname, $deploy, $addrend, $admin_username, $requires_sql, $scriptsdev, $human) = @ARGV;
  • trunk/locker/deploy/bin/rails

  • trunk/locker/deploy/bin/trac

    r1791 r1901  
    5454$cfg->newval('components', 'webadmin.*', 'enabled');
    5555$cfg->newval('components', 'tracext.git.*', 'enabled') if $repotype eq "git";
     56$cfg->newval('components', 'tracext.hg.*', 'enabled') if $repotype eq "hg";
    5657$cfg->RewriteConfig();
    5758
  • trunk/locker/deploy/bin/turbogears

    • Property svn:mergeinfo deleted
  • trunk/locker/deploy/trac/trac.fcgi

    r1528 r1901  
    22
    33import os, os.path, sys
    4 from trac.web import fcgi_frontend
     4from trac.web.main import dispatch_request
     5from trac.web._fcgi import WSGIServer
    56import urlparse
    67
     
    3839        env.log.exception(e)
    3940    if env.needs_upgrade():
    40         fcgi_frontend._fcgi.WSGIServer(send_upgrade_message).run()
     41        WSGIServer(send_upgrade_message).run()
    4142        sys.exit(0)
    4243    if hasattr(trac.env, 'env_cache'):
     
    6566                 referrer.path, referrer.query, referrer.fragment))
    6667
    67     return fcgi_frontend.dispatch_request(environ, start_response)
     68    return dispatch_request(environ, start_response)
    6869
    69 fcgi_frontend._fcgi.WSGIServer(my_dispatch_request).run()
     70WSGIServer(my_dispatch_request).run()
  • trunk/locker/sbin

    • Property svn:mergeinfo deleted
  • trunk/locker/sql/bin/save-password

Note: See TracChangeset for help on using the changeset viewer.