diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2014-11-26 16:41:50 +0100 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2014-11-26 16:51:30 +0100 |
commit | 1dd53cc9903d394117bbc70ef043cb7054543d95 (patch) | |
tree | 7a11df2f8302cb4a32dca5f1989d13143fb2b2da /nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | |
parent | fd27bc85bee699bc40435d7a99b60ddfd2287f44 (diff) |
Mediawiki: updated for Apache 2.4
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/mediawiki.nix')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index d7bdd81b7ebe0..c0ed204163974 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 @@ -121,8 +132,7 @@ in Alias ${config.urlPrefix}/images ${config.uploadDir} <Directory ${config.uploadDir}> - Order allow,deny - Allow from all + ${allGranted} Options -Indexes </Directory> ''} @@ -142,8 +152,7 @@ in ''} <Directory ${mediawikiRoot}> - Order allow,deny - Allow from all + ${allGranted} DirectoryIndex index.php </Directory> |