Changeset 1724

Timestamp:

Nov 13, 2010, 8:30:59 AM (14 years ago)

Author:

ezyang

Message:

Merge in changes from trunk.

Location:

branches/locker-dev/locker/bin

Files:

• . (modified) (1 prop)
• crontab (modified) (2 diffs, 1 prop)
• disable-scripts-test (copied) (copied from trunk/locker/bin/disable-scripts-test)
• enable-scripts-test (copied) (copied from trunk/locker/bin/enable-scripts-test)
• firefox-test (copied) (copied from trunk/locker/bin/firefox-test)
• fix-php-ini-scripts (copied) (copied from trunk/locker/bin/fix-php-ini-scripts)
• scripts-start (modified) (1 diff)
• signup-minimal (modified) (2 diffs)

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="ATHENA_USER@mit.edu"
+MAILTO="SCRIPTS_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/scripts-start

@@ -4 +4 @@
     echo 'mediawiki MediaWiki'
     echo 'wordpress WordPress'
-    echo 'joomla Joomla'
-    echo 'e107 e107'
     echo 'gallery2 Gallery2'
     echo 'phpbb phpBB'
-    echo 'advancedbook Advanced Guest Book'
-    echo 'phpical PHP iCalendar'
     echo 'trac Trac'
     echo 'turbogears TurboGears'

branches/locker-dev/locker/bin/signup-minimal

@@ -1 +1 @@
 #!/bin/bash
+
+if false; then
+    echo "Scripts signups are temporarily unavailable.  Please"
+    echo "check back later."
+    exit 1
+fi
 
 if [ "$initlname" = "" ]; then
@@ -83 +89 @@
   echo "ERROR:"
   echo "It appears as though you are not an administrator of the locker <$lname>."
-  echo "Try running \"fs sa /mit/$lname $afsuser all\" and starting over."
+  echo "Try running \"fs setacl /mit/$lname $afsuser all\" and starting over."
   echo "Contact scripts@mit.edu if you are unable to solve the problem."
   exit 1