commit 0640622eb1fb3ca4182e71aa3a48def88458ecec · pyrox.dev/nixpkgs

+28 -19

nixos/modules/services/web-servers/varnish/default.nix

···

       8
       8
        
       let

     

       9
       9
        
         cfg = config.services.varnish;

     

       10
       10
        
       

     

       11
       11
       +
         # Varnish has very strong opinions and very complicated code around handling

     

       12
       12
       +
         # the stateDir. After a lot of back and forth, we decided that we a)

     

       13
       13
       +
         # do not want a configurable option here, as most of the handling depends

     

       14
       14
       +
         # on the version and the compile time options. Putting everything into

     

       15
       15
       +
         # /var/run (RAM backed) is absolutely recommended by Varnish anyways.

     

       16
       16
       +
         # We do need to pay attention to the version-dependend variations, though!

     

       17
       17
       +
         stateDir =

     

       18
       18
       +
           if

     

       19
       19
       +
             (lib.versionOlder cfg.package.version "7")

     

       20
       20
       +
           # Remove after Varnish 6.0 is gone. In 6.0 varnishadm always appends the

     

       21
       21
       +
           # hostname (by default) and can't be nudged to not use any name. This has

     

       22
       22
       +
           # long changed by 7.5 and can be used without the host name.

     

       23
       23
       +
           then

     

       24
       24
       +
             "/var/run/varnish/${config.networking.hostName}"

     

       25
       25
       +
           # Newer varnish uses this:

     

       26
       26
       +
           else

     

       27
       27
       +
             "/var/run/varnishd";

     

       28
       28
       +
       

     

       11
       29
        
         commandLine =

     

       12
       30
        
           "-f ${pkgs.writeText "default.vcl" cfg.config}"

     

       13
       31
        
           +

     
···

       17
       35
        
                }' -r vmod_path";

     

       18
       36
        
       in

     

       19
       37
        
       {

     

       38
       38
       +
         imports = [

     

       39
       39
       +
           (lib.mkRemovedOptionModule [

     

       40
       40
       +
             "services"

     

       41
       41
       +
             "varnish"

     

       42
       42
       +
             "stateDir"

     

       43
       43
       +
           ] "The `stateDir` option never was functional or useful. varnish uses compile-time settings.")

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       20
       46
        
         options = {

     

       21
       47
        
           services.varnish = {

     

       22
       48
        
             enable = lib.mkEnableOption "Varnish Server";

     
···

       42
       68
        
               '';

     

       43
       69
        
             };

     

       44
       70
        
       

     

       45
       45
       -
             stateDir = lib.mkOption {

     

       46
       46
       -
               type = lib.types.path;

     

       47
       47
       -
               default = "/run/varnish/${config.networking.hostName}";

     

       48
       48
       -
               defaultText = lib.literalExpression ''"/run/varnish/''${config.networking.hostName}"'';

     

       49
       49
       -
               description = ''

     

       50
       50
       -
                 Directory holding all state for Varnish to run. Note that this should be a tmpfs in order to avoid performance issues and crashes.

     

       51
       51
       -
               '';

     

       52
       52
       -
             };

     

       53
       71
        
             extraModules = lib.mkOption {

     

       54
       72
        
               type = lib.types.listOf lib.types.package;

     

       55
       73
        
               default = [ ];

     
···

       76
       94
        
             description = "Varnish";

     

       77
       95
        
             wantedBy = [ "multi-user.target" ];

     

       78
       96
        
             after = [ "network.target" ];

     

       79
       79
       -
             preStart = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''

     

       80
       80
       -
               mkdir -p ${cfg.stateDir}

     

       81
       81
       -
               chown -R varnish:varnish ${cfg.stateDir}

     

       82
       82
       -
             '';

     

       83
       83
       -
             postStop = lib.mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''

     

       84
       84
       -
               rm -rf ${cfg.stateDir}

     

       85
       85
       -
             '';

     

       86
       97
        
             serviceConfig = {

     

       87
       98
        
               Type = "simple";

     

       88
       99
        
               PermissionsStartOnly = true;

     

       89
       89
       -
               ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${cfg.stateDir} -F ${cfg.extraCommandLine} ${commandLine}";

     

       100
       100
       +
               ExecStart = "${cfg.package}/sbin/varnishd -a ${cfg.http_address} -n ${stateDir} -F ${cfg.extraCommandLine} ${commandLine}";

     

       90
       101
        
               Restart = "always";

     

       91
       102
        
               RestartSec = "5s";

     

       92
       103
        
               User = "varnish";

     

       93
       104
        
               Group = "varnish";

     

       94
       94
       -
               RuntimeDirectory = lib.mkIf (lib.hasPrefix "/run/" cfg.stateDir) (

     

       95
       95
       -
                 lib.removePrefix "/run/" cfg.stateDir

     

       96
       96
       -
               );

     

       105
       105
       +
               RuntimeDirectory = lib.removePrefix "/var/run/" stateDir;

     

       97
       106
        
               AmbientCapabilities = "cap_net_bind_service";

     

       98
       107
        
               NoNewPrivileges = true;

     

       99
       108
        
               LimitNOFILE = 131072;

+6 -2

nixos/tests/varnish.nix

···

       56
       56
        
       

     

       57
       57
        
             client.wait_until_succeeds("curl -f http://varnish/nix-cache-info");

     

       58
       58
        
       

     

       59
       59
       -
             client.wait_until_succeeds("nix-store -r ${testPath}");

     

       60
       60
       -
             client.succeed("${testPath}/bin/hello");

     

       59
       59
       +
             client.wait_until_succeeds("nix-store -r ${testPath}")

     

       60
       60
       +
             client.succeed("${testPath}/bin/hello")

     

       61
       61
       +
       

     

       62
       62
       +
             output = varnish.succeed("varnishadm status")

     

       63
       63
       +
             print(output)

     

       64
       64
       +
             assert "Child in state running" in output, "Unexpected varnishadm response"

     

       61
       65
        
           '';

     

       62
       66
        
         }

     

       63
       67
        
       )

+1 -1

pkgs/servers/varnish/default.nix

···

       54
       54
        
               ++ lib.optional stdenv.hostPlatform.isDarwin libunwind

     

       55
       55
        
               ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;

     

       56
       56
        
       

     

       57
       57
       -
             buildFlags = [ "localstatedir=/var/spool" ];

     

       57
       57
       +
             buildFlags = [ "localstatedir=/var/run" ];

     

       58
       58
        
       

     

       59
       59
        
             postPatch = ''

     

       60
       60
        
               substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"