Changeset 2735 for trunk/server/common

Timestamp:

Nov 9, 2015, 5:51:05 PM (9 years ago)

Author:

andersk

Message:

Replace empty scriptsVhostPath with ‘.’

Trac: #167

Location:

trunk/server/common/oursrc/accountadm

Files:

• signup-scripts-backend.in (modified) (1 diff)
• vhostadd (modified) (3 diffs)

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

@@ -148 +148 @@
 scriptsVhostAlias: $username.scripts
 scriptsVhostAccount: uid=$username,ou=People,dc=scripts,dc=mit,dc=edu
-scriptsVhostDirectory: 
+scriptsVhostDirectory: .
 
 EOF

trunk/server/common/oursrc/accountadm/vhostadd

@@ -33 +33 @@
 printf "Docroot: $home/web_scripts" >&2
 read subdir
+subdir=${subdir%/}
+docroot=$home/web_scripts$subdir
+path=${subdir#/}
+path=${path:-.}
 
 tmpfile=$(mktemp -t vhostadd.XXXXXX) || exit $?
@@ -51 +55 @@
 
 cat <<EOF >> "$tmpfile"
-apacheDocumentRoot: $home/web_scripts$subdir
+apacheDocumentRoot: $docroot
 apacheSuexecUid: $uid
 apacheSuexecGid: $gid
@@ -69 +73 @@
 cat <<EOF >> "$tmpfile"
 scriptsVhostAccount: $user_dn
-scriptsVhostDirectory: ${subdir#/}
+scriptsVhostDirectory: $path
 EOF