Changeset 827

Timestamp:

Aug 29, 2008, 6:17:32 PM (16 years ago)

Author:

andersk

Message:

Create scriptsVhost records automatically.

Location:

server/common/oursrc/accountadm

Files:

• signup-scripts-backend.in (modified) (2 diffs)
• vhostadd (modified) (2 diffs)

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

@@ -104 +104 @@
 
 dn: apacheServerName=$username.scripts.mit.edu,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
-objectclass: apacheConfig
+objectClass: apacheConfig
 apacheServerName: $username.scripts.mit.edu
 apacheServerAlias: $username.scripts
@@ -110 +110 @@
 apacheSuexecUid: $uid1
 apacheSuexecGid: $gid1
+
+dn: scriptsVhostName=$username.scripts.mit.edu,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
+objectClass: scriptsVhost
+scriptsVhostName: $username.scripts.mit.edu
+scriptsVhostAlias: $username.scripts
+scriptsVhostAccount: uid=$username,ou=People,dc=scripts,dc=mit,dc=edu
+scriptsVhostDirectory: 
 
 EOF

server/common/oursrc/accountadm/vhostadd

@@ -27 +27 @@
 IFS=: read user x uid gid x home x <<< "$pw"
 
+user_dn=$(ldapsearch -LLL -x -b ou=People,dc=scripts,dc=mit,dc=edu '(uid=andersk)' dn | perl -0pe 's/\n //g; s/^dn: //')
+
 printf "Docroot: $home/web_scripts" >&2
 read subdir
@@ -50 +52 @@
 apacheSuexecUid: $uid
 apacheSuexecGid: $gid
+
+dn: scriptsVhostName=$host,ou=VirtualHosts,dc=scripts,dc=mit,dc=edu
+objectClass: scriptsVhost
+objectClass: top
+scriptsVhostName: $host
+EOF
+
+if [ "${host%mit.edu}" != "$host" ]; then
+    cat <<EOF >> "$tmpfile"
+scriptsVhostAlias: ${host%.mit.edu}
+EOF
+fi
+
+cat <<EOF >> "$tmpfile"
+scriptsVhostAccount: $user_dn
+scriptsVhostDirectory: ${subdir#/}
 EOF