Merge pull request #32062 from volth/patch-73

nixos/varnish: check .vcl syntax at compile time

Changed files
+14 -3
nixos
modules
services
web-servers
varnish
+14 -3
nixos/modules/services/web-servers/varnish/default.nix
···
{ config, lib, pkgs, ...}:
let
cfg = config.services.varnish;
in
-
with lib;
{
options = {
services.varnish = {
···
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";
···
};
environment.systemPackages = [ pkgs.varnish ];
users.extraUsers.varnish = {
group = "varnish";
···
{ config, lib, pkgs, ...}:
+
+
with lib;
+
let
cfg = config.services.varnish;
+
commandLine = "-f ${pkgs.writeText "default.vcl" cfg.config}" +
+
optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
in
{
options = {
services.varnish = {
···
serviceConfig = {
Type = "simple";
PermissionsStartOnly = true;
+
ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
Restart = "always";
RestartSec = "5s";
User = "varnish";
···
};
environment.systemPackages = [ pkgs.varnish ];
+
+
# check .vcl syntax at compile time (e.g. before nixops deployment)
+
system.extraDependencies = [
+
(pkgs.stdenv.mkDerivation {
+
name = "check-varnish-syntax";
+
buildCommand = "${pkgs.varnish}/sbin/varnishd -C ${commandLine} 2> $out";
+
})
+
];
users.extraUsers.varnish = {
group = "varnish";