Index: branches/locker-dev/locker/bin/scripts-advancedbook =================================================================== --- branches/locker-dev/locker/bin/scripts-advancedbook (revision 2072) +++ (revision ) @@ -1,6 +1,0 @@ -#!/bin/sh - -sname="Advanced Guestbook" -deploy="advancedbook" -prompt_username=1 -. /mit/scripts/deploy$scriptsdev/bin/onathena Index: branches/locker-dev/locker/bin/scripts-advancedpoll =================================================================== --- branches/locker-dev/locker/bin/scripts-advancedpoll (revision 2072) +++ (revision ) @@ -1,10 +1,0 @@ -#!/bin/sh - -# This automatic installer is no longer advertised. -# Here is our old description of it: -# * "Advanced Poll":http://proxy2.de/scripts.php ~["demo":http://proxy2.de/poll/]~ - polling software featuring multiple polls, templates, unlimited options, multi-language support, IP-Logging, IP-Locking, cookie support, comment feature, vote expire feature, and random poll support. - -sname="Advanced Poll" -deploy="advancedpoll" -prompt_username=1 -. /mit/scripts/deploy$scriptsdev/bin/onathena Index: branches/locker-dev/locker/bin/scripts-e107 =================================================================== --- branches/locker-dev/locker/bin/scripts-e107 (revision 2072) +++ (revision ) @@ -1,6 +1,0 @@ -#!/bin/sh - -sname="e107" -deploy="e107" -prompt_username=1 -. /mit/scripts/deploy$scriptsdev/bin/onathena Index: branches/locker-dev/locker/bin/scripts-phpical =================================================================== --- branches/locker-dev/locker/bin/scripts-phpical (revision 2072) +++ (revision ) @@ -1,6 +1,0 @@ -#!/bin/sh - -sname="PHP iCalendar" -deploy="phpical" -requires_sql=0 -. /mit/scripts/deploy$scriptsdev/bin/onathena Index: branches/locker-dev/locker/bin/scripts-ssh =================================================================== --- branches/locker-dev/locker/bin/scripts-ssh (revision 2072) +++ branches/locker-dev/locker/bin/scripts-ssh (revision 2073) @@ -9,5 +9,5 @@ -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 \ Index: branches/locker-dev/locker/bin/scripts-start =================================================================== --- branches/locker-dev/locker/bin/scripts-start (revision 2072) +++ branches/locker-dev/locker/bin/scripts-start (revision 2073) @@ -6,7 +6,7 @@ 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' Index: branches/locker-dev/locker/bin/ssh =================================================================== --- branches/locker-dev/locker/bin/ssh (revision 2072) +++ branches/locker-dev/locker/bin/ssh (revision 2073) @@ -11,5 +11,5 @@ -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 \ "$@" Index: branches/locker-dev/locker/deploy/bin/advancedbook =================================================================== --- branches/locker-dev/locker/deploy/bin/advancedbook (revision 2072) +++ (revision ) @@ -1,39 +1,0 @@ -#!/usr/bin/perl -use strict; -use FindBin qw($Bin); -use lib $Bin; -use onserver; - -setup(); - -undef $/; - -open(FILE, "admin/contemp.php"); -my $a = ; -close(FILE); -$a =~ s/localhost/$sqlhost/g; -$a =~ s/dbuser/$sqluser/g; -$a =~ s/dbpass/$sqlpass/g; -$a =~ s/guestbookdb/$sqldb/g; -$a =~ s/useremail/$email/g; -open(FILE, ">admin/config.inc.php"); -print FILE $a; -close(FILE); - -open(FILE, "instemp.php"); -$a = ; -close(FILE); -$a =~ s/gbuser/$admin_username/g; -$a =~ s/gbpass/$admin_password/g; -open(FILE, ">install.php"); -print FILE $a; -close(FILE); - -fetch_uri( - 'install.php', - {}, - {action => 'Create table', - db => $sqldb, - host => $sqlhost, - name => $sqluser, - pass => $sqlpass}); Index: branches/locker-dev/locker/deploy/bin/advancedpoll =================================================================== --- branches/locker-dev/locker/deploy/bin/advancedpoll (revision 2072) +++ (revision ) @@ -1,39 +1,0 @@ -#!/usr/bin/perl -use strict; -use FindBin qw($Bin); -use lib $Bin; -use onserver; - -setup(); - -undef $/; -open(FILE, "include/contemp.php"); -my $a = ; -close(FILE); -$a =~ s/localhost/$sqlhost/g; -$a =~ s/dbuser/$sqluser/g; -$a =~ s/dbpass/$sqlpass/g; -$a =~ s/polldb/$sqldb/g; -open(FILE, ">include/config.inc.php"); -print FILE $a; -close(FILE); - -fetch_uri('install.php', {action => 'step_2'}); -fetch_uri('install.php', {action => 'step_3'}); -fetch_uri('install.php', {action => 'step_4'}); - -fetch_uri( - 'install.php', - {action => 'step_6'}, - {action => 'step_6', - username => $admin_username, - password => $admin_password}); - -unlink('include/contemp.php'); - -print < $sqlhost, - name => $sqluser, - password => $sqlpass, - db => $sqldb, - prefix => 'e107_', - stage => 3}) =~ /name='previous_steps' value='(.*)'/; - -my ($prevb) = fetch_uri( - 'install.php', - {}, - {stage => 4, - previous_steps => $preva}) =~ /name='previous_steps' value='(.*)'/; - -my ($prevc) = fetch_uri( - 'install.php', - {}, - {u_name => $admin_username, - d_name => $admin_username, - pass1 => $admin_password, - pass2 => $admin_password, - email => $email, - stage => 6, - previous_steps => $prevb}) =~ /name='previous_steps' value='(.*)'/; - -fetch_uri( - 'install.php', - {}, - {stage => "7", - previous_steps => $prevc}); - -unlink 'install.php'; Index: branches/locker-dev/locker/deploy/bin/phpical =================================================================== --- branches/locker-dev/locker/deploy/bin/phpical (revision 2072) +++ (revision ) @@ -1,30 +1,0 @@ -#!/usr/bin/perl -use strict; -use FindBin qw($Bin); -use lib $Bin; -use onserver; - -setup(); - -undef $/; -open(FILE, "contemp.php"); -my $a = ; -close(FILE); -$a =~ s/adminpass/$admin_password/g; -$a =~ s|\$timezone\s*= '';|\$timezone = 'US/Eastern';|g; -$a =~ s/\$phpicalendar_publishing/\/\/ WARNING: The scripts.mit.edu maintainers have had to disable this feature on scripts.mit.edu because it contains a serious security vulnerability that has not been addressed by the software\'s authors. Please do not try to enable this feature\n\$phpicalendar_publishing/; -open(FILE, ">config.inc.php"); -print FILE $a; -close(FILE); - -#system('cp', '/mit/scripts/deploy/phpical/MIT Academic Calendar.ics', 'calendars/'); - -unlink('contemp.php'); -unlink('calendars/publish.ical.php'); - -print <