mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
nixos/varnish: change default stateDir to /run
The stateDir, or as varnish calls it, the workdir should always be a
tmpfs. Otherwise, performance issues may occur. See:
- https://varnish-cache.org/docs/trunk/reference/varnishd.html#opt-n
- https://github.com/varnishcache/varnish-cache/issues/4121
(cherry picked from commit 9e5316a1c5
)
This commit is contained in:
parent
36bae45077
commit
691e09524a
@ -34,10 +34,10 @@ in
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/spool/varnish/${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"/var/spool/varnish/''${config.networking.hostName}"'';
|
||||
default = "/run/varnish/${config.networking.hostName}";
|
||||
defaultText = literalExpression ''"/run/varnish/''${config.networking.hostName}"'';
|
||||
description = ''
|
||||
Directory holding all state for Varnish to run.
|
||||
Directory holding all state for Varnish to run. Note that this should be a tmpfs in order to avoid performance issues and crashes.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -68,11 +68,11 @@ in
|
||||
description = "Varnish";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
preStart = ''
|
||||
preStart = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
|
||||
mkdir -p ${cfg.stateDir}
|
||||
chown -R varnish:varnish ${cfg.stateDir}
|
||||
'';
|
||||
postStop = ''
|
||||
postStop = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
|
||||
rm -rf ${cfg.stateDir}
|
||||
'';
|
||||
serviceConfig = {
|
||||
@ -83,6 +83,7 @@ in
|
||||
RestartSec = "5s";
|
||||
User = "varnish";
|
||||
Group = "varnish";
|
||||
RuntimeDirectory = mkIf (lib.hasPrefix "/run/" cfg.stateDir) (lib.removePrefix "/run/" cfg.stateDir);
|
||||
AmbientCapabilities = "cap_net_bind_service";
|
||||
NoNewPrivileges = true;
|
||||
LimitNOFILE = 131072;
|
||||
|
Loading…
Reference in New Issue
Block a user