Index: trunk/locker/sbin/delete-user
===================================================================
--- trunk/locker/sbin/delete-user	(revision 2735)
+++ trunk/locker/sbin/delete-user	(revision 2759)
@@ -37,15 +37,4 @@
     return group_record
 
-def findApacheConfig(l, uid):
-    host_records = ll.search_s(
-        "ou=VirtualHosts,dc=scripts,dc=mit,dc=edu",
-        ldap.SCOPE_SUBTREE,
-        ldap.filter.filter_format(
-            "(&(objectClass=apacheConfig)" +
-            "(apacheSuexecUid=%s))",
-            [uid]))
-
-    return host_records
-
 def findVhost(l, full_name):
     host_records = ll.search_s(
@@ -73,7 +62,4 @@
     group_record = findGroup(ll, user)
 
-    print "Searching for apache configurations..."
-    apache_configs = findApacheConfig(ll, user_record[1]['uidNumber'][0])
-
     print "Searching for vhost configurations..."
     vhost_configs = findVhost(ll, user_record[0])
@@ -83,7 +69,4 @@
     delete_record(ll, group_record[0])
 
-    for config in apache_configs:
-        delete_record(ll, config[0])
-
     for vhost in vhost_configs:
         delete_record(ll, vhost[0])
Index: trunk/locker/sbin/vhostadd
===================================================================
--- trunk/locker/sbin/vhostadd	(revision 2735)
+++ trunk/locker/sbin/vhostadd	(revision 2759)
@@ -42,21 +42,4 @@
 
 cat <<EOF > "$tmpfile"
-dn: apacheServerName=$host,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
-objectClass: apacheConfig
-objectClass: top
-apacheServerName: $host
-EOF
-
-if [ "${host%mit.edu}" != "$host" ]; then
-    cat <<EOF >> "$tmpfile"
-apacheServerAlias: ${host%.mit.edu}
-EOF
-fi
-
-cat <<EOF >> "$tmpfile"
-apacheDocumentRoot: $docroot
-apacheSuexecUid: $uid
-apacheSuexecGid: $gid
-
 dn: scriptsVhostName=$host,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
 objectClass: scriptsVhost
Index: trunk/locker/sbin/vhostedit
===================================================================
--- trunk/locker/sbin/vhostedit	(revision 2735)
+++ trunk/locker/sbin/vhostedit	(revision 2759)
@@ -7,3 +7,3 @@
 
 exec ldapvi --bind sasl -Y GSSAPI -h scripts5.mit.edu -b dc=scripts,dc=mit,dc=edu \
-       "(|(&(objectClass=apacheConfig)(|$(printf '(apacheServerName=%s)' "$@")$(printf '(apacheServerAlias=%s)' "$@")))(&(objectClass=scriptsVhost)(|$(printf '(scriptsVhostName=%s)' "$@")$(printf '(scriptsVhostAlias=%s)' "$@"))))"
+       "(&(objectClass=scriptsVhost)(|$(printf '(scriptsVhostName=%s)' "$@")$(printf '(scriptsVhostAlias=%s)' "$@")))"