diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-28 19:00:27 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-28 19:00:27 +0300 |
| commit | 8150cf11b0892c73009a100737a791b959ef2c23 (patch) | |
| tree | 10bb74e8795e7d9aaf935ba565578dc9c721566e /nixos | |
| parent | 90b84a60a63705ed9a11bbc5a1169476dfdf222d (diff) | |
| parent | 4855b0b3fb38d2f617cc50563ff23fac27e6f851 (diff) | |
| download | nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar.gz nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar.bz2 nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar.lz nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar.xz nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.tar.zst nixpkgs-8150cf11b0892c73009a100737a791b959ef2c23.zip | |
Merge pull request #7605 from ip1981/wiki
Mediawiki updates
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/per-server-options.nix | 2 |
2 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 c0ed2041639..52d8c89baff 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.3"; + name= "mediawiki-1.23.9"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf"; + sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql"; }; skins = config.skins; @@ -142,6 +142,7 @@ in RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs} + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedFiles} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix index 0db27b0bcbe..5abcc5e7490 100644 --- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -97,7 +97,7 @@ with lib; default = []; example = [ { urlPath = "/foo/bar.png"; - dir = "/home/eelco/some-file.png"; + files = "/home/eelco/some-file.png"; } ]; description = '' |