Index: /trunk/ldap/doc/install-ldap
===================================================================
--- /trunk/ldap/doc/install-ldap	(revision 2758)
+++ /trunk/ldap/doc/install-ldap	(revision 2759)
@@ -55,23 +55,7 @@
 
 ldapvi -b cn=config
-# Add these indexes (8 of them):
+# Add these indexes (6 of them):
 
 <<<EOF
-
-add cn=apacheServerName, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
-objectClass: top
-objectClass: nsIndex
-cn: apacheServerName
-nsSystemIndex: false
-nsIndexType: eq
-nsIndexType: pres
-
-add cn=apacheServerAlias, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
-objectClass: top
-objectClass: nsIndex
-cn: apacheServerAlias
-nsSystemIndex: false
-nsIndexType: eq
-nsIndexType: pres
 
 add cn=scriptsVhostName, cn=index, cn=userRoot, cn=ldbm database, cn=plugins, cn=config
Index: unk/ldap/el/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif
===================================================================
--- /trunk/ldap/el/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif	(revision 2758)
+++ 	(revision )
@@ -1,107 +1,0 @@
-#
-################################################################################
-#
-dn: cn=schema
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.2
-  NAME 'apacheServerName'
-  DESC 'mod_vhost_ldap: Apache ServerName'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.3
-  NAME 'apacheServerAlias'
-  DESC 'mod_vhost_ldap: Apache ServerAlias'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.4
-  NAME 'apacheDocumentRoot'
-  DESC 'mod_vhost_ldap: Apache DocumentRoot'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.5
-  NAME 'apacheServerAdmin'
-  DESC 'mod_vhost_ldap: Apache ServerAdmin'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.14287.1.1.6
-  NAME 'apacheScriptAlias'
-  DESC 'mod_cfg_ldap: Apache ScriptAlias'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.7
-  NAME 'apacheSuexecUid'
-  DESC 'mod_vhost_ldap: Apache SuexecUid'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.8
-  NAME 'apacheSuexecGid'
-  DESC 'mod_vhost_ldap: Apache SuexecGid'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-objectClasses: (
-  1.3.6.1.4.1.8387.1.2.1
-  NAME 'apacheConfig'
-  SUP 'top'
-  MUST ( apacheServerName $ apacheDocumentRoot )
-  MAY ( apacheServerAlias $ apacheServerAdmin $ apacheScriptAlias $ apacheSuexecUid $ apacheSuexecGid )
-  )
-#
-################################################################################
-#
Index: /trunk/locker/sbin/delete-user
===================================================================
--- /trunk/locker/sbin/delete-user	(revision 2758)
+++ /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 2758)
+++ /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 2758)
+++ /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)' "$@")))"
Index: /trunk/server/common/oursrc/accountadm/signup-scripts-backend.in
===================================================================
--- /trunk/server/common/oursrc/accountadm/signup-scripts-backend.in	(revision 2758)
+++ /trunk/server/common/oursrc/accountadm/signup-scripts-backend.in	(revision 2759)
@@ -135,12 +135,4 @@
 gidNumber: $gid1
 
-dn: apacheServerName=$username.scripts.mit.edu,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
-objectClass: apacheConfig
-apacheServerName: $username.scripts.mit.edu
-apacheServerAlias: $username.scripts
-apacheDocumentRoot: $homedir/web_scripts
-apacheSuexecUid: $uid1
-apacheSuexecGid: $gid1
-
 dn: scriptsVhostName=$username.scripts.mit.edu,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
 objectClass: scriptsVhost
Index: /trunk/server/common/oursrc/accountadm/vhostadd
===================================================================
--- /trunk/server/common/oursrc/accountadm/vhostadd	(revision 2758)
+++ /trunk/server/common/oursrc/accountadm/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/server/common/oursrc/accountadm/vhostedit
===================================================================
--- /trunk/server/common/oursrc/accountadm/vhostedit	(revision 2758)
+++ /trunk/server/common/oursrc/accountadm/vhostedit	(revision 2759)
@@ -6,3 +6,3 @@
 fi
 
-exec ldapvi -b dc=scripts,dc=mit,dc=edu "(|(&(objectClass=apacheConfig)(|$(printf '(apacheServerName=%s)' "$@")$(printf '(apacheServerAlias=%s)' "$@")))(&(objectClass=scriptsVhost)(|$(printf '(scriptsVhostName=%s)' "$@")$(printf '(scriptsVhostAlias=%s)' "$@"))))"
+exec ldapvi -b dc=scripts,dc=mit,dc=edu "(&(objectClass=scriptsVhost)(|$(printf '(scriptsVhostName=%s)' "$@")$(printf '(scriptsVhostAlias=%s)' "$@")))"
Index: unk/server/fedora/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif
===================================================================
--- /trunk/server/fedora/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif	(revision 2758)
+++ 	(revision )
@@ -1,107 +1,0 @@
-#
-################################################################################
-#
-dn: cn=schema
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.2
-  NAME 'apacheServerName'
-  DESC 'mod_vhost_ldap: Apache ServerName'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.3
-  NAME 'apacheServerAlias'
-  DESC 'mod_vhost_ldap: Apache ServerAlias'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.4
-  NAME 'apacheDocumentRoot'
-  DESC 'mod_vhost_ldap: Apache DocumentRoot'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.5
-  NAME 'apacheServerAdmin'
-  DESC 'mod_vhost_ldap: Apache ServerAdmin'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.14287.1.1.6
-  NAME 'apacheScriptAlias'
-  DESC 'mod_cfg_ldap: Apache ScriptAlias'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.7
-  NAME 'apacheSuexecUid'
-  DESC 'mod_vhost_ldap: Apache SuexecUid'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-attributeTypes: (
-  1.3.6.1.4.1.8387.1.1.8
-  NAME 'apacheSuexecGid'
-  DESC 'mod_vhost_ldap: Apache SuexecGid'
-  SUP name
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
-  SINGLE-VALUE
-  )
-#
-################################################################################
-#
-objectClasses: (
-  1.3.6.1.4.1.8387.1.2.1
-  NAME 'apacheConfig'
-  SUP 'top'
-  MUST ( apacheServerName $ apacheDocumentRoot )
-  MAY ( apacheServerAlias $ apacheServerAdmin $ apacheScriptAlias $ apacheSuexecUid $ apacheSuexecGid )
-  )
-#
-################################################################################
-#