Changeset 2759 for trunk/server

Timestamp:

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

Author:

andersk

Message:

Remove all remaining traces of apacheConfig records

Location:

trunk/server

Files:

• common/oursrc/accountadm/signup-scripts-backend.in (modified) (1 diff)
• common/oursrc/accountadm/vhostadd (modified) (1 diff)
• common/oursrc/accountadm/vhostedit (modified) (1 diff)
• fedora/config/etc/dirsrv/slapd-scripts/schema/99mod_vhost_ldap.ldif (deleted)

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