commit 3838b7e07e8a79ece6cb249eb4bf0a2bfd6d388a · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

···

       1540
        
             </listitem>

     

       1541
        
             <listitem>

     

       1542
        
               <para>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1543
        
                 The option <literal>services.duplicati.dataDir</literal> has

     

       1544
        
                 been added to allow changing the location of duplicati’s

     

       1545
        
                 files.

···

       1540
        
             </listitem>

     

       1541
        
             <listitem>

     

       1542
        
               <para>

     

       1543
       +
                 A new module was added for the Envoy reverse proxy, providing

     

       1544
       +
                 the options <literal>services.envoy.enable</literal> and

     

       1545
       +
                 <literal>services.envoy.settings</literal>.

     

       1546
       +
               </para>

     

       1547
       +
             </listitem>

     

       1548
       +
             <listitem>

     

       1549
       +
               <para>

     

       1550
        
                 The option <literal>services.duplicati.dataDir</literal> has

     

       1551
        
                 been added to allow changing the location of duplicati’s

     

       1552
        
                 files.

nixos/doc/manual/release-notes/rl-2205.section.md

···

       547
        
       

     

       548
        
       - The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.

     

       549
        
       

     

       0
        
       
     

       0
        
       
     

       550
        
       - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.

     

       551
        
       

     

       552
        
       - The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.

···

       547
        
       

     

       548
        
       - The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.

     

       549
        
       

     

       550
       +
       - A new module was added for the Envoy reverse proxy, providing the options `services.envoy.enable` and `services.envoy.settings`.

     

       551
       +
       

     

       552
        
       - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.

     

       553
        
       

     

       554
        
       - The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.

nixos/modules/module-list.nix

···

       753
        
         ./services/networking/ncdns.nix

     

       754
        
         ./services/networking/nomad.nix

     

       755
        
         ./services/networking/ejabberd.nix

     

       0
        
       
     

       756
        
         ./services/networking/epmd.nix

     

       757
        
         ./services/networking/ergo.nix

     

       758
        
         ./services/networking/ergochat.nix

···

       753
        
         ./services/networking/ncdns.nix

     

       754
        
         ./services/networking/nomad.nix

     

       755
        
         ./services/networking/ejabberd.nix

     

       756
       +
         ./services/networking/envoy.nix

     

       757
        
         ./services/networking/epmd.nix

     

       758
        
         ./services/networking/ergo.nix

     

       759
        
         ./services/networking/ergochat.nix

+84

nixos/modules/services/networking/envoy.nix

···

       1
       +
       { config, lib, pkgs, ... }:

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         cfg = config.services.envoy;

     

       7
       +
         format = pkgs.formats.json { };

     

       8
       +
         conf = format.generate "envoy.json" cfg.settings;

     

       9
       +
         validateConfig = file:

     

       10
       +
           pkgs.runCommand "validate-envoy-conf" { } ''

     

       11
       +
             ${pkgs.envoy}/bin/envoy --log-level error --mode validate -c "${file}"

     

       12
       +
             cp "${file}" "$out"

     

       13
       +
           '';

     

       14
       +
       

     

       15
       +
       in

     

       16
       +
       

     

       17
       +
       {

     

       18
       +
         options.services.envoy = {

     

       19
       +
           enable = mkEnableOption "Envoy reverse proxy";

     

       20
       +
       

     

       21
       +
           settings = mkOption {

     

       22
       +
             type = format.type;

     

       23
       +
             default = { };

     

       24
       +
             example = literalExpression ''

     

       25
       +
               {

     

       26
       +
                 admin = {

     

       27
       +
                   access_log_path = "/dev/null";

     

       28
       +
                   address = {

     

       29
       +
                     socket_address = {

     

       30
       +
                       protocol = "TCP";

     

       31
       +
                       address = "127.0.0.1";

     

       32
       +
                       port_value = 9901;

     

       33
       +
                     };

     

       34
       +
                   };

     

       35
       +
                 };

     

       36
       +
                 static_resources = {

     

       37
       +
                   listeners = [];

     

       38
       +
                   clusters = [];

     

       39
       +
                 };

     

       40
       +
               }

     

       41
       +
             '';

     

       42
       +
             description = ''

     

       43
       +
               Specify the configuration for Envoy in Nix.

     

       44
       +
             '';

     

       45
       +
           };

     

       46
       +
         };

     

       47
       +
       

     

       48
       +
         config = mkIf cfg.enable {

     

       49
       +
           environment.systemPackages = [ pkgs.envoy ];

     

       50
       +
           systemd.services.envoy = {

     

       51
       +
             description = "Envoy reverse proxy";

     

       52
       +
             after = [ "network-online.target" ];

     

       53
       +
             requires = [ "network-online.target" ];

     

       54
       +
             wantedBy = [ "multi-user.target" ];

     

       55
       +
             serviceConfig = {

     

       56
       +
               ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}";

     

       57
       +
               DynamicUser = true;

     

       58
       +
               Restart = "no";

     

       59
       +
               CacheDirectory = "envoy";

     

       60
       +
               LogsDirectory = "envoy";

     

       61
       +
               AmbientCapabilities = "CAP_NET_BIND_SERVICE";

     

       62
       +
               CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";

     

       63
       +
               RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK AF_XDP";

     

       64
       +
               SystemCallArchitectures = "native";

     

       65
       +
               LockPersonality = true;

     

       66
       +
               RestrictNamespaces = true;

     

       67
       +
               RestrictRealtime = true;

     

       68
       +
               PrivateUsers = false;  # breaks CAP_NET_BIND_SERVICE

     

       69
       +
               PrivateDevices = true;

     

       70
       +
               ProtectClock = true;

     

       71
       +
               ProtectControlGroups = true;

     

       72
       +
               ProtectHome = true;

     

       73
       +
               ProtectKernelLogs = true;

     

       74
       +
               ProtectKernelModules = true;

     

       75
       +
               ProtectKernelTunables = true;

     

       76
       +
               ProtectProc = "ptraceable";

     

       77
       +
               ProtectHostname = true;

     

       78
       +
               ProtectSystem = "strict";

     

       79
       +
               UMask = "0066";

     

       80
       +
               SystemCallFilter = "~@clock @module @mount @reboot @swap @obsolete @cpu-emulation";

     

       81
       +
             };

     

       82
       +
           };

     

       83
       +
         };

     

       84
       +
       }

nixos/tests/all-tests.nix

···

       142
        
         engelsystem = handleTest ./engelsystem.nix {};

     

       143
        
         enlightenment = handleTest ./enlightenment.nix {};

     

       144
        
         env = handleTest ./env.nix {};

     

       0
        
       
     

       145
        
         ergo = handleTest ./ergo.nix {};

     

       146
        
         ergochat = handleTest ./ergochat.nix {};

     

       147
        
         etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

···

       142
        
         engelsystem = handleTest ./engelsystem.nix {};

     

       143
        
         enlightenment = handleTest ./enlightenment.nix {};

     

       144
        
         env = handleTest ./env.nix {};

     

       145
       +
         envoy = handleTest ./envoy.nix {};

     

       146
        
         ergo = handleTest ./ergo.nix {};

     

       147
        
         ergochat = handleTest ./ergochat.nix {};

     

       148
        
         etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

+33

nixos/tests/envoy.nix

···

       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ...} : {

     

       2
       +
         name = "envoy";

     

       3
       +
         meta = with pkgs.lib.maintainers; {

     

       4
       +
           maintainers = [ cameronnemo ];

     

       5
       +
         };

     

       6
       +
       

     

       7
       +
         nodes.machine = { pkgs, ... }: {

     

       8
       +
           services.envoy.enable = true;

     

       9
       +
           services.envoy.settings = {

     

       10
       +
             admin = {

     

       11
       +
               access_log_path = "/dev/null";

     

       12
       +
               address = {

     

       13
       +
                 socket_address = {

     

       14
       +
                   protocol = "TCP";

     

       15
       +
                   address = "127.0.0.1";

     

       16
       +
                   port_value = 9901;

     

       17
       +
                 };

     

       18
       +
               };

     

       19
       +
             };

     

       20
       +
             static_resources = {

     

       21
       +
               listeners = [];

     

       22
       +
               clusters = [];

     

       23
       +
             };

     

       24
       +
           };

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
         testScript = ''

     

       28
       +
           machine.start()

     

       29
       +
           machine.wait_for_unit("envoy.service")

     

       30
       +
           machine.wait_for_open_port(9901)

     

       31
       +
           machine.wait_until_succeeds("curl -fsS localhost:9901/ready")

     

       32
       +
         '';

     

       33
       +
       })

+3 -2

pkgs/servers/http/envoy/default.nix

···

       127
        
         ];

     

       128
        
       

     

       129
        
         passthru.tests = {

     

       130
       -
           # No tests for Envoy itself (yet), but it's tested as a core component of Pomerium.

     

       131
       -
           inherit (nixosTests) pomerium;

     

       0
        
       
     

       132
        
         };

     

       133
        
       

     

       134
        
         meta = with lib; {

···

       127
        
         ];

     

       128
        
       

     

       129
        
         passthru.tests = {

     

       130
       +
           envoy = nixosTests.envoy;

     

       131
       +
           # tested as a core component of Pomerium

     

       132
       +
           pomerium = nixosTests.pomerium;

     

       133
        
         };

     

       134
        
       

     

       135
        
         meta = with lib; {