Index: branches/fc13-dev/lvs/debian/config/etc/ha.d/ldirectord.cf
===================================================================
--- branches/fc13-dev/lvs/debian/config/etc/ha.d/ldirectord.cf	(revision 1686)
+++ branches/fc13-dev/lvs/debian/config/etc/ha.d/ldirectord.cf	(revision 1690)
@@ -7,11 +7,13 @@
 # iptables rules caused SMTP to use FWM 3
 virtual=3
-        real=18.181.0.53:25 gate 1
-        real=18.181.0.57:25 gate 1
-        real=18.181.0.167:25 gate 6144
-	real=18.181.0.228:25 gate 6144
-	real=18.181.0.234:25 gate 4096
-	real=18.181.0.235:25 gate 4096
-	real=18.181.0.237:25 gate 4096
+        #real=18.181.0.53:25  gate 4096 # old-faithful
+        #real=18.181.0.57:25  gate 4096 # better-mousetrap
+        real=18.181.0.167:25 gate 6144 # bees-knees
+	real=18.181.0.228:25 gate 6144 # cats-whiskers
+	real=18.181.0.234:25 gate 4096 # busy-beaver
+	real=18.181.0.235:25 gate 4096 # real-mccoy
+	#real=18.181.0.237:25 gate 4096 # pancake-bunny
+	#real=18.181.0.236:25 gate 4096 # whole-enchilada
+	#real=18.181.0.135:25 gate 4096 # shining-armor
         service=smtp
         scheduler=wlc
@@ -23,11 +25,13 @@
 # Apache (80, 443, and 444) uses FWM 2
 virtual=2
-	real=18.181.0.53 gate 1
-	real=18.181.0.57 gate 1
-	real=18.181.0.167 gate 6144
-	real=18.181.0.228 gate 6144
-	real=18.181.0.234 gate 4096
-	real=18.181.0.235 gate 4096
-	real=18.181.0.237 gate 4096
+	real=18.181.0.53  gate 3096 # old-faithful
+	real=18.181.0.57  gate 3096 # better-mousetrap
+	real=18.181.0.167 gate 6144 # bees-knees
+	real=18.181.0.228 gate 6144 # cats-whiskers
+	real=18.181.0.234 gate 4096 # busy-beaver
+	real=18.181.0.235 gate 4096 # real-mccoy
+	real=18.181.0.237 gate 4096 # pancake-bunny
+	real=18.181.0.236 gate 4096 # whole-enchilada
+	real=18.181.0.135 gate 4096 # shining-armor
 	fallback=127.0.0.1 gate
 	service=http
@@ -43,11 +47,13 @@
 # Everything else uses FWM 1 and gets sent only to the primary
 virtual=1
-        real=18.181.0.53 gate "heartbeat/services", "1"
-        real=18.181.0.57 gate "heartbeat/services", "2"
-        real=18.181.0.167 gate "heartbeat/services", "3"
-	real=18.181.0.228 gate "heartbeat/services", "4"
-	real=18.181.0.234 gate "heartbeat/services", "5"
-	real=18.181.0.235 gate "heartbeat/services", "6"
-	real=18.181.0.237 gate "heartbeat/services", "7"
+        real=18.181.0.53  gate "heartbeat/services", "1" # old-faithful
+        real=18.181.0.57  gate "heartbeat/services", "2" # better-mousetrap
+        real=18.181.0.167 gate "heartbeat/services", "3" # bees-knees
+	real=18.181.0.228 gate "heartbeat/services", "4" # cats-whiskers
+	real=18.181.0.234 gate "heartbeat/services", "5" # busy-beaver
+	real=18.181.0.235 gate "heartbeat/services", "6" # real-mccoy
+	real=18.181.0.237 gate "heartbeat/services", "7" # pancake-bunny
+	real=18.181.0.236 gate "heartbeat/services", "8" # whole-enchilada
+	real=18.181.0.135 gate "heartbeat/services", "9" # shining-armor
 	service=http
         scheduler=wrr
Index: branches/fc13-dev/server/doc/install-howto.sh
===================================================================
--- branches/fc13-dev/server/doc/install-howto.sh	(revision 1686)
+++ branches/fc13-dev/server/doc/install-howto.sh	(revision 1690)
@@ -297,4 +297,7 @@
     chkconfig httpd on
 
+# nrpe is required for nagios alerts
+    chkconfig nrpe on
+
 # Check sql user credentials (needs to be done after LDAP is setup)
     chown sql /etc/sql-mit-edu.cfg.php
Index: branches/fc13-dev/server/fedora/config/etc/scripts/modprobe
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/scripts/modprobe	(revision 1690)
+++ branches/fc13-dev/server/fedora/config/etc/scripts/modprobe	(revision 1690)
@@ -0,0 +1,3 @@
+#!/bin/sh
+logger -p authpriv.info -- "Ignoring request from kernel: modprobe $*"
+false
Index: branches/fc13-dev/server/fedora/config/etc/sysconfig/iptables
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/sysconfig/iptables	(revision 1686)
+++ branches/fc13-dev/server/fedora/config/etc/sysconfig/iptables	(revision 1690)
@@ -1,26 +1,8 @@
 # Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*mangle
-:PREROUTING ACCEPT [857:1670874]
-:INPUT ACCEPT [857:1670874]
+*filter
+:INPUT ACCEPT [0:0]
+-A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [1197:347244]
-:POSTROUTING ACCEPT [1195:345719]
+:OUTPUT ACCEPT [0:0]
 COMMIT
 # Completed on Tue Jul 18 01:46:04 2006
-# Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*nat
-:OUTPUT ACCEPT [0:0]
-:PREROUTING ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-#-A PREROUTING -p tcp -m tcp --dport 3306 -j DNAT --to-destination 18.181.0.52:3306
-#-A POSTROUTING -p tcp -m tcp -d 18.181.0.52 --dport 3306 -j MASQUERADE
-COMMIT
-# Completed on Tue Jul 18 01:46:04 2006
-# Generated by iptables-save v1.3.5 on Tue Jul 18 01:46:04 2006
-*filter
-:INPUT ACCEPT [292118:164733476]
--A INPUT -p udp -m udp --dport 161 ! -s 18.0.0.0/8 -j REJECT
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [500523:537785790]
-COMMIT
-# Completed on Tue Jul 18 01:46:04 2006
Index: branches/fc13-dev/server/fedora/config/etc/sysctl.conf
===================================================================
--- branches/fc13-dev/server/fedora/config/etc/sysctl.conf	(revision 1686)
+++ branches/fc13-dev/server/fedora/config/etc/sysctl.conf	(revision 1690)
@@ -13,2 +13,3 @@
 net.ipv4.tcp_keepalive_time = 825
 afs.GCPAGs = 0
+kernel.modprobe = /etc/scripts/modprobe