Changeset 2735


Ignore:
Timestamp:
Nov 9, 2015, 5:51:05 PM (7 years ago)
Author:
andersk
Message:
Replace empty scriptsVhostPath with ‘.’

Trac: #167
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/locker/sbin/vhostadd

    r1901 r2735  
    3333printf "Docroot: $home/web_scripts" >&2
    3434read subdir
     35subdir=${subdir%/}
     36docroot=$home/web_scripts$subdir
     37path=${subdir#/}
     38path=${path:-.}
    3539
    3640tmpfile=$(mktemp -t vhostadd.XXXXXX) || exit $?
     
    5155
    5256cat <<EOF >> "$tmpfile"
    53 apacheDocumentRoot: $home/web_scripts$subdir
     57apacheDocumentRoot: $docroot
    5458apacheSuexecUid: $uid
    5559apacheSuexecGid: $gid
     
    6973cat <<EOF >> "$tmpfile"
    7074scriptsVhostAccount: $user_dn
    71 scriptsVhostDirectory: ${subdir#/}
     75scriptsVhostDirectory: $path
    7276EOF
    7377
  • trunk/server/common/oursrc/accountadm/signup-scripts-backend.in

    r2575 r2735  
    148148scriptsVhostAlias: $username.scripts
    149149scriptsVhostAccount: uid=$username,ou=People,dc=scripts,dc=mit,dc=edu
    150 scriptsVhostDirectory:
     150scriptsVhostDirectory: .
    151151
    152152EOF
  • trunk/server/common/oursrc/accountadm/vhostadd

    r892 r2735  
    3333printf "Docroot: $home/web_scripts" >&2
    3434read subdir
     35subdir=${subdir%/}
     36docroot=$home/web_scripts$subdir
     37path=${subdir#/}
     38path=${path:-.}
    3539
    3640tmpfile=$(mktemp -t vhostadd.XXXXXX) || exit $?
     
    5155
    5256cat <<EOF >> "$tmpfile"
    53 apacheDocumentRoot: $home/web_scripts$subdir
     57apacheDocumentRoot: $docroot
    5458apacheSuexecUid: $uid
    5559apacheSuexecGid: $gid
     
    6973cat <<EOF >> "$tmpfile"
    7074scriptsVhostAccount: $user_dn
    71 scriptsVhostDirectory: ${subdir#/}
     75scriptsVhostDirectory: $path
    7276EOF
    7377
Note: See TracChangeset for help on using the changeset viewer.