Changeset 2759 for trunk/locker/sbin/delete-user

Timestamp:

Feb 26, 2016, 6:08:08 AM (8 years ago)

Author:

andersk

Message:

Remove all remaining traces of apacheConfig records

File:

• trunk/locker/sbin/delete-user (modified) (3 diffs)

trunk/locker/sbin/delete-user

@@ -37 +37 @@
     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 +62 @@
     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 +69 @@
     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])