diff options
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/mediawiki.nix')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 76c64f8cb29..c0ed2041639 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -4,6 +4,17 @@ with lib; let + httpd = serverInfo.serverConfig.package; + + version24 = !versionOlder httpd.version "2.4"; + + allGranted = if version24 then '' + Require all granted + '' else '' + Order allow,deny + Allow from all + ''; + mediawikiConfig = pkgs.writeText "LocalSettings.php" '' <?php @@ -72,15 +83,13 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.1"; + name= "mediawiki-1.23.3"; src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl"; + sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf"; }; - patches = [ ./mediawiki-postgresql-fixes.patch ]; - skins = config.skins; buildPhase = @@ -123,8 +132,7 @@ in Alias ${config.urlPrefix}/images ${config.uploadDir} <Directory ${config.uploadDir}> - Order allow,deny - Allow from all + ${allGranted} Options -Indexes </Directory> ''} @@ -133,7 +141,7 @@ in RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d - ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs} + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" @@ -144,8 +152,7 @@ in ''} <Directory ${mediawikiRoot}> - Order allow,deny - Allow from all + ${allGranted} DirectoryIndex index.php </Directory> |