Index: branches/fc11-dev/locker/deploy/bin/joomla
===================================================================
--- branches/fc11-dev/locker/deploy/bin/joomla	(revision 1206)
+++ branches/fc11-dev/locker/deploy/bin/joomla	(revision 1210)
@@ -3,5 +3,4 @@
 use lib '/mit/scripts/deploy/bin';
 use onserver;
-use Cwd;
 use File::Path;
 
@@ -13,30 +12,74 @@
 chomp($title);
 
-fetch_uri(
-    'installation/install2.php',
-    {},
-    {DBhostname => $sqlhost,
-     DBuserName => $sqluser,
-     DBpassword => $sqlpass,
-     DBDel => 0,
-     DBname => $sqldb,
-     DBPrefix => 'jos_',
-     DBSample => 1});
+print "\nSetting up your configuration file...\n";
+open CONFIGTEMPLATE, "configuration.php-dist";
+open CONFIGURATION, ">configuration.php";
+while (<CONFIGTEMPLATE>) {
+  chomp;
+  if (/var \$sitename /) {
+    $_ = "	var \$sitename = '$title';";
+  } elsif (/var \$dbtype /) {
+    $_ = "	var \$dbtype = 'mysql';";
+  } elsif (/var \$host /) {
+    $_ = "	var \$host = '$sqlhost';";
+  } elsif (/var \$user /) {
+    $_ = "	var \$user = '$sqluser';";
+  } elsif (/var \$password /) {
+    $_ = "	var \$password = '$sqlpass';";
+  } elsif (/var \$db /) {
+    $_ = "	var \$db = '$sqldb';";
+  } elsif (/var \$dbprefix /) {
+    $_ = "	var \$dbprefix = 'jos_';";
+  } elsif (/var \$secret /) {
+    my $random = `dd if=/dev/urandom bs=1k count=1 | md5sum | cut -c1-32`;
+    $random =~ s/\n//;
+    $_ = "	var \$secret = '$random';";
+  } elsif (/var \$mailfrom /) {
+    $_ = "	var \$mailfrom = '$email';";
+  } elsif (/var \$fromname /) {
+    $_ = "	var \$fromname = '$title';";
+  }
+  print CONFIGURATION "$_\n";
+}
+close CONFIGURATION;
+close CONFIGTEMPLATE;
 
-fetch_uri(
-    'installation/install4.php',
-    {},
-    {DBhostname => $sqlhost,
-     DBuserName => $sqluser,
-     DBpassword => $sqlpass,
-     DBname => $sqldb,
-     DBPrefix => 'jos_',
-     sitename => $title,
-     siteUrl => $base_uri,
-     absolutePath => getcwd(),
-     adminEmail => $email,
-     adminPassword => $admin_password,
-     filePerms => 0,
-     dirPerms => 0});
+print "\nInitializing database schema...\n";
+my $schemafile = "installation/sql/mysql/joomla-real.sql";
+open SCHEMATEMPLATE, "installation/sql/mysql/joomla.sql";
+open SCHEMA, ">$schemafile";
+while (<SCHEMATEMPLATE>) {
+  if (/#__/) {
+    $_ =~ s/#__/jos_/g;
+  }
+  print SCHEMA "$_";
+}
+close SCHEMA;
+close SCHEMATEMPLATE;
+system("cat $schemafile | mysql $sqldb");
 
+print "\nLoading sample data...\n";
+my $sampledatafile = "installation/sql/mysql/sample_data-real.sql";
+open SAMPLETEMPLATE, "installation/sql/mysql/sample_data.sql";
+open SAMPLE, ">$sampledatafile";
+while (<SAMPLETEMPLATE>) {
+  if (/#__/) {
+    $_ =~ s/#__/jos_/g;
+  }
+  print SAMPLE "$_";
+}
+close SAMPLE;
+close SAMPLETEMPLATE;
+system("cat $sampledatafile | mysql $sqldb");
+
+print "\nCreating your admin account...\n";
+system("mysql -e \"INSERT INTO jos_users VALUES (62, 'Administrator', '$admin_username', '$email', MD5('$admin_password'), 'Super Administrator', 0, 1, 25, NOW(), NOW(), '', '')\" $sqldb");
+system("mysql -e \"INSERT INTO jos_core_acl_aro VALUES (10, 'users', '62', 0, 'Administrator', 0)\" $sqldb");
+system("mysql -e \"INSERT INTO jos_core_acl_groups_aro_map VALUES (25, '', 10)\" $sqldb");
+
+print "\nCleaning up installation tree...\n";
 rmtree('installation');
+
+print "\nDone!\n";
+exit 0;
+
Index: branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-finger.sh
===================================================================
--- branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-finger.sh	(revision 1210)
+++ branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-finger.sh	(revision 1210)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ulimit -v 10240
+
+read line
+line=${line%[:blank:]}
+line=${line%
+}
+
+/sbin/ipvsadm
Index: branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-http.sh
===================================================================
--- branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-http.sh	(revision 1210)
+++ branches/fc11-dev/lvs/debian/config/etc/ha.d/ldirectord-http.sh	(revision 1210)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+ulimit -v 10240
+
+# Read and ignore the request
+line=foo
+while [ -n "$line" ]; do
+    read line
+    line=${line%[:blank:]}
+    line=${line%
+}
+done
+
+# Generate an HTTP reply
+
+echo "HTTP/1.0 200 OK
+"
+echo "Content-type: text/html
+"
+echo "
+"
+echo "<html><head><title>scripts.mit.edu server status</title></head><body><h1>scripts.mit.edu server status</h1><p>The following table shows a list of the servers that are currently handling web requests for scripts.mit.edu:</p><table>"
+/sbin/ipvsadm -L -f 2 | sed 's/:0//; s/:Port//' | awk 'BEGIN { OFS="</td><td>" } /->/ { print "<tr><td>" $2, $4, $5, $6 "</td></tr>"}'
+echo "</table></body></html>"
Index: branches/fc11-dev/lvs/debian/config/etc/inetd.conf
===================================================================
--- branches/fc11-dev/lvs/debian/config/etc/inetd.conf	(revision 1206)
+++ branches/fc11-dev/lvs/debian/config/etc/inetd.conf	(revision 1210)
@@ -39,3 +39,4 @@
 
 # Make it easy to remotely query these LVS servers
-79	stream	tcp	nowait	root	/sbin/ipvsadm
+79	stream	tcp	nowait	root	/etc/heartbeat/ldirectord-finger.sh
+78	stream	tcp	nowait	root	/etc/heartbeat/ldirectord-http.sh
Index: branches/fc11-dev/lvs/debian/config/etc/network/if-up.d/iptables
===================================================================
--- branches/fc11-dev/lvs/debian/config/etc/network/if-up.d/iptables	(revision 1206)
+++ branches/fc11-dev/lvs/debian/config/etc/network/if-up.d/iptables	(revision 1210)
@@ -20,4 +20,6 @@
 # Send SMTP-bound traffic to FWM 3 (load-balanced)
 iptables -A scripts -t mangle -m tcp -p tcp --dport 25 -j MARK --set-mark 3
+# Send finger-bound traffic to FWM 255 (the LVS director itself)
+iptables -A scripts -t mangle -m tcp -p tcp --dport 78:79 -j MARK --set-mark 255
 # Send everything else to FWM 1 (primary)
 iptables -A scripts -t mangle -m mark --mark 0 -j MARK --set-mark 1
Index: branches/fc11-dev/noc/nagios/status-user/finger.sh
===================================================================
--- branches/fc11-dev/noc/nagios/status-user/finger.sh	(revision 1206)
+++ branches/fc11-dev/noc/nagios/status-user/finger.sh	(revision 1210)
@@ -1,3 +1,5 @@
 #!/bin/bash
+
+ulimit -v 10240
 
 export LINES=1000
Index: branches/fc11-dev/server/fedora/config/etc/yum.conf
===================================================================
--- branches/fc11-dev/server/fedora/config/etc/yum.conf	(revision 1206)
+++ branches/fc11-dev/server/fedora/config/etc/yum.conf	(revision 1210)
@@ -9,5 +9,5 @@
 plugins=1
 metadata_expire=1800
-installonlypkgs=kernel kernel-devel
+installonlypkgs=kernel kernel-devel kmod-openafs
 
 # PUT YOUR REPOS HERE OR IN separate files named file.repo