Changeset 2759 for trunk

Timestamp:

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

Author:

andersk

Message:

Remove all remaining traces of apacheConfig records

Location:

trunk

Files:

• ldap/doc/install-ldap (modified) (1 diff)
• ldap/el/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif (deleted)
• locker/sbin/delete-user (modified) (3 diffs)
• locker/sbin/vhostadd (modified) (1 diff)
• locker/sbin/vhostedit (modified) (1 diff)
• server/common/oursrc/accountadm/signup-scripts-backend.in (modified) (1 diff)
• server/common/oursrc/accountadm/vhostadd (modified) (1 diff)
• server/common/oursrc/accountadm/vhostedit (modified) (1 diff)
• server/fedora/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif (deleted)

trunk/ldap/doc/install-ldap

@@ -55 +55 @@
 
 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

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])

trunk/locker/sbin/vhostadd

@@ -42 +42 @@
 
 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

trunk/locker/sbin/vhostedit

@@ -7 +7 @@
 
 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)' "$@")))"

trunk/server/common/oursrc/accountadm/signup-scripts-backend.in

@@ -135 +135 @@
 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

trunk/server/common/oursrc/accountadm/vhostadd

@@ -42 +42 @@
 
 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

trunk/server/common/oursrc/accountadm/vhostedit

@@ -6 +6 @@
 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)' "$@")))"