diff options
| author | Shea Levy <shea@shealevy.com> | 2014-02-27 07:17:05 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-02-27 07:17:10 -0500 |
| commit | f7c04b1e6b43114c6ffa822c29e93621e97ed35a (patch) | |
| tree | eaab8d1eb581810fd0ac5cd92138a03dfa758432 /nixos | |
| parent | 1e7300ad676d91717ef36a8eeee46763287c0ee2 (diff) | |
| download | nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar.gz nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar.bz2 nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar.lz nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar.xz nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.tar.zst nixlib-f7c04b1e6b43114c6ffa822c29e93621e97ed35a.zip | |
mediawiki: Don't rewrite /images if uploads are enabled
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 29efc975a383..f5669faebc97 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -130,12 +130,13 @@ in RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d - RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" + RewriteRule ${if config.enableUploads + then "!^/images" + else "^.*\$" + } %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == "" then "" else "${config.articleUrlPrefix}/" }index.php [L] - - RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */ ''} <Directory ${mediawikiRoot}> |