Merge pull request #27699 from volth/varnish-fixes-sq

nixos/varnish: made compatible with varnish 5.1.2, add modules
This commit is contained in:
Joachim F 2017-08-22 22:01:00 +00:00 committed by GitHub
commit f1514a5876
6 changed files with 143 additions and 8 deletions

View file

@ -7,14 +7,10 @@ with lib;
{
options = {
services.varnish = {
enable = mkOption {
default = false;
description = "
Enable the Varnish Server.
";
};
enable = mkEnableOption "Varnish Server";
http_address = mkOption {
type = types.str;
default = "*:6081";
description = "
HTTP listen address and port.
@ -22,17 +18,37 @@ with lib;
};
config = mkOption {
type = types.lines;
description = "
Verbatim default.vcl configuration.
";
};
stateDir = mkOption {
type = types.path;
default = "/var/spool/varnish/${config.networking.hostName}";
description = "
Directory holding all state for Varnish to run.
";
};
extraModules = mkOption {
type = types.listOf types.package;
default = [];
example = literalExample "[ pkgs.varnish-geoip ]";
description = "
Varnish modules (except 'std').
";
};
extraCommandLine = mkOption {
type = types.str;
default = "";
example = "-s malloc,256M";
description = "
Command line switches for varnishd (run 'varnishd -?' to get list of options)
";
};
};
};
@ -42,6 +58,7 @@ with lib;
systemd.services.varnish = {
description = "Varnish";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = ''
mkdir -p ${cfg.stateDir}
chown -R varnish:varnish ${cfg.stateDir}
@ -49,8 +66,19 @@ with lib;
postStop = ''
rm -rf ${cfg.stateDir}
'';
serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
serviceConfig.Type = "forking";
serviceConfig = {
Type = "simple";
PermissionsStartOnly = true;
ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}"
+ optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
Restart = "always";
RestartSec = "5s";
User = "varnish";
Group = "varnish";
AmbientCapabilities = "cap_net_bind_service";
NoNewPrivileges = true;
LimitNOFILE = 131072;
};
};
environment.systemPackages = [ pkgs.varnish ];

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, libmhash, docutils }:
stdenv.mkDerivation rec {
version = "1.0.1";
name = "varnish-digest-${version}";
src = fetchFromGitHub {
owner = "varnish";
repo = "libvmod-digest";
rev = "libvmod-digest-${version}";
sha256 = "0v18bqbsblhajpx5qvczic3psijhx5l2p2qlw1dkd6zl33hhppy7";
};
nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
buildInputs = [ varnish libmhash ];
postPatch = ''
substituteInPlace autogen.sh --replace "-I \''${dataroot}/aclocal" ""
substituteInPlace Makefile.am --replace "-I \''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" ""
'';
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
doCheck = true;
meta = with stdenv.lib; {
description = "Digest and HMAC vmod";
homepage = https://github.com/varnish/libvmod-digest;
inherit (varnish.meta) license platforms maintainers;
};
}

View file

@ -0,0 +1,31 @@
{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, geoip, docutils }:
stdenv.mkDerivation rec {
version = "1.0.2";
name = "varnish-geoip-${version}";
src = fetchFromGitHub {
owner = "varnish";
repo = "libvmod-geoip";
rev = "libvmod-geoip-${version}";
sha256 = "1gmadayqh3dais14c4skvd47w8h4kyifg7kcw034i0777z5hfpyn";
};
patches = [
# IPv6 support
(fetchpatch {
url = https://github.com/volth/libvmod-geoip-1/commit/0966fe8.patch;
sha256 = "053im8h2y8qzs37g95ksr00sf625p23r5ps1j0a2h4lfg70vf4ry";
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig docutils ];
buildInputs = [ varnish geoip ];
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
meta = with stdenv.lib; {
description = "GeoIP Varnish module by Varnish Software";
homepage = https://github.com/varnish/libvmod-geoip;
inherit (varnish.meta) license platforms maintainers;
};
}

View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
stdenv.mkDerivation rec {
version = "0.10.2";
name = "varnish-modules-${version}";
src = fetchurl {
url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz";
sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im";
};
nativeBuildInputs = [ pkgconfig docutils ];
buildInputs = [ varnish python ];
meta = with stdenv.lib; {
description = "Collection of Varnish Cache modules (vmods) by Varnish Software";
homepage = https://github.com/varnish/varnish-modules;
inherit (varnish.meta) license platforms maintainers;
};
}

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }:
stdenv.mkDerivation rec {
version = "1.2.0";
name = "varnish-rtstatus-${version}";
src = fetchurl {
url = "https://download.varnish-software.com/libvmod-rtstatus/libvmod-rtstatus-${version}.tar.gz";
sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly";
};
nativeBuildInputs = [ pkgconfig docutils ];
buildInputs = [ varnish python ];
configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ];
meta = with stdenv.lib; {
description = "Varnish realtime status page";
homepage = https://github.com/varnish/libvmod-rtstatus;
inherit (varnish.meta) license platforms maintainers;
};
}

View file

@ -4868,6 +4868,10 @@ with pkgs;
};
varnish = callPackage ../servers/varnish { };
varnish-modules = callPackage ../servers/varnish/modules.nix { };
varnish-digest = callPackage ../servers/varnish/digest.nix { };
varnish-geoip = callPackage ../servers/varnish/geoip.nix { };
varnish-rtstatus = callPackage ../servers/varnish/rtstatus.nix { };
venus = callPackage ../tools/misc/venus {
python = python27;