From e3ac5e1502b62d7aa72640f0d3edcb858a3690f8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 6 Oct 2021 22:00:36 +0200 Subject: [PATCH] nixos/varnish: add enableConfigCheck --- .../modules/services/web-servers/varnish/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 7597b80baf60..0ebf58eb9f61 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -13,6 +13,8 @@ in services.varnish = { enable = mkEnableOption "Varnish Server"; + enableConfigCheck = mkEnableOption "checking the config during build time" // { default = true; }; + package = mkOption { type = types.package; default = pkgs.varnish; @@ -96,11 +98,10 @@ in environment.systemPackages = [ cfg.package ]; # check .vcl syntax at compile time (e.g. before nixops deployment) - system.extraDependencies = [ - (pkgs.stdenv.mkDerivation { - name = "check-varnish-syntax"; - buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)"; - }) + system.extraDependencies = mkIf cfg.enableConfigCheck [ + (pkgs.runCommand "check-varnish-syntax" {} '' + ${cfg.package}/bin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1) + '') ]; users.users.varnish = {