* Put the static files for the Subversion service in a separate directory.

svn path=/nixos/trunk/; revision=10697
This commit is contained in:
Eelco Dolstra 2008-02-14 20:59:04 +00:00
parent 7563d6e144
commit a9281eae63
2 changed files with 3 additions and 4 deletions

View File

@ -17,6 +17,7 @@ in
grubMenuBuilder grubMenuBuilder
initialRamdisk initialRamdisk
kernel kernel
modulesTree
nix nix
system system
systemPath systemPath

View File

@ -230,12 +230,10 @@ let
}; };
staticFilesConfig = '' staticFilesConfig = ''
# !!! this breaks UserDir if urlPrefix == "" Alias ${urlPrefix}/svn-files ${staticFiles}/
Alias ${if urlPrefix == "" then "/" else urlPrefix} ${staticFiles}/
<Directory ${staticFiles}> <Directory ${staticFiles}>
Order allow,deny Order allow,deny
Allow from all Allow from all
DirectoryIndex repoman
</Directory> </Directory>
''; '';
@ -291,7 +289,7 @@ in {
<Location ${urlPrefix}/repos-xml> <Location ${urlPrefix}/repos-xml>
${reposConfig "repos-xml"} ${reposConfig "repos-xml"}
SVNIndexXSLT "${urlPrefix}/xsl/svnindex.xsl" SVNIndexXSLT "${urlPrefix}/svn-files/xsl/svnindex.xsl"
</Location> </Location>
${viewvcConfig} ${viewvcConfig}