Merge pull request #117269 from aanderse/apacheHttpdPackages

Sandro fa69c575 08d3f9aa

Changed files
+2 -37
pkgs
servers
http
apache-modules
mod_evasive
top-level
-35
pkgs/servers/http/apache-modules/mod_evasive/default.nix
···
-
{ lib, stdenv, fetchurl, apacheHttpd }:
-
-
if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
-
-
throw "mod_evasive is not supported on Apache httpd 2.4"
-
-
else
-
-
stdenv.mkDerivation {
-
name = "mod_evasive-1.10.1";
-
-
src = fetchurl {
-
url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz";
-
sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07";
-
};
-
-
buildInputs = [ apacheHttpd ];
-
-
buildPhase = ''
-
export APACHE_LIBEXECDIR=$out/modules
-
export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
-
apxs -ca mod_evasive20.c
-
'';
-
-
installPhase = ''
-
mkdir -p $out/modules
-
cp .libs/mod_evasive20.so $out/modules
-
'';
-
-
meta = {
-
homepage = "http://www.zdziarski.com/blog/?page_id=442";
-
description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
-
platforms = lib.platforms.linux;
-
};
-
}
+2 -2
pkgs/top-level/all-packages.nix
···
mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
-
mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
+
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
···
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
-
apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
+
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };