diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-01-08 11:15:15 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-01-08 11:15:15 +1100 |
| commit | 9467ca6878dcb28fb570b7e04882b315e8cbd234 (patch) | |
| tree | a2f80dca751ec0a01081c9b486e81dab9e4ff27f /base/root/scripts | |
| parent | 62b59d8a7c46ed9a7bdca15e4336e1ccd0322533 (diff) | |
| parent | bcfc58379f5bddba49cd378837174a6617710b5e (diff) | |
Merge commit 'martin/for-tridge'
Diffstat (limited to 'base/root/scripts')
| -rw-r--r-- | base/root/scripts/conf.base | 8 | ||||
| -rwxr-xr-x | base/root/scripts/postinstall.sh | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/base/root/scripts/conf.base b/base/root/scripts/conf.base index 3bc9d34..10b5dfd 100644 --- a/base/root/scripts/conf.base +++ b/base/root/scripts/conf.base @@ -45,8 +45,8 @@ data=/gpfs/data [httpexports] - ScriptAliasMatch "^/gpfs/data" "/var/www/cgi-bin/browse.cgi" - RewriteRule "^/data(.*)$" "/gpfs/data$1" [PT] + ScriptAlias "/data" "/var/www/cgi-bin/browse.cgi" + RewriteRule ^/data(/(.*)$|$) - [E=CGIBROWSE_PREFIX:/gpfs/data] [nfsexports] "/gpfs/data" *(rw,no_root_squash,fsid=834258092) @@ -467,8 +467,8 @@ logfacility=LOG_USER [/etc/httpd/conf.d/shares.config] - ScriptAliasMatch "^/gpfs/data" "/var/www/cgi-bin/browse.cgi" - RewriteRule "^/data(.*)$" "/gpfs/data$1" [PT] + ScriptAlias "/data" "/var/www/cgi-bin/browse.cgi" + RewriteRule ^/data(/(.*)$|$) - [E=CGIBROWSE_PREFIX:/gpfs/data] [/etc/vsftpd/vsftpd.conf] # no anon access diff --git a/base/root/scripts/postinstall.sh b/base/root/scripts/postinstall.sh index 8335155..595e54b 100755 --- a/base/root/scripts/postinstall.sh +++ b/base/root/scripts/postinstall.sh @@ -49,3 +49,7 @@ echo "Rebuilding the GPFS modules" # the TSM packages cause trouble with auto-install # yum -y install TIVsm-API TIVsm-HSM TIVsm-BA + +echo "Enabling NFS locking" +chkconfig nfslock on +service nfslock start |