public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3780 from ip1981/master

Browse Source 
Fixed rewrite rules for Mediawiki
This commit is contained in:
Rickard Nilsson 2014-08-25 12:46:08 +02:00
commit 684e8b241e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/strings.nix
View File

@ -34,6 +34,9 @@ rec {
concatStringsSep = separator: list: concatStringsSep = separator: list:
concatStrings (intersperse separator list); concatStrings (intersperse separator list);
concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list);
# Construct a Unix-style search path consisting of each `subDir" # Construct a Unix-style search path consisting of each `subDir"
# directory of the given list of packages. For example, # directory of the given list of packages. For example,

1
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -133,6 +133,7 @@ in
RewriteEngine On RewriteEngine On
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
RewriteRule ${if config.enableUploads RewriteRule ${if config.enableUploads
then "!^/images" then "!^/images"
else "^.*\$" else "^.*\$"