Changeset 2073 for branches/locker-dev/locker

Timestamp:

Nov 23, 2011, 4:05:31 PM (14 years ago)

Author:

andersk

Message:

Merge r1846:2072 from trunk/locker to branches/locker-dev/locker

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• bin (modified) (1 prop)
• bin/scripts-advancedbook (deleted)
• bin/scripts-advancedpoll (deleted)
• bin/scripts-e107 (deleted)
• bin/scripts-phpical (deleted)
• bin/scripts-ssh (modified) (1 diff)
• bin/scripts-start (modified) (1 diff)
• bin/ssh (modified) (1 diff, 1 prop)
• deploy/bin (modified) (1 prop)
• deploy/bin/advancedbook (deleted)
• deploy/bin/advancedpoll (deleted)
• deploy/bin/django (modified) (1 prop)
• deploy/bin/e107 (deleted)
• deploy/bin/phpical (deleted)
• deploy/bin/rails (modified) (1 prop)
• deploy/bin/trac (modified) (1 prop)
• etc (copied) (copied from trunk/locker/etc)
• sql/bin/save-password (modified) (1 prop)

branches/locker-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/locker-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/locker-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 \
         "$@"