commit 1cb88030ddfc681133a1be009c95543a5869fa65 · pyrox.dev/nixpkgs

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

···

       189
       189
        
       

     

       190
       190
        
       - [echoip](https://github.com/mpolden/echoip), a simple service for looking up your IP address. Available as [services.echoip](#opt-services.echoip.enable).

     

       191
       191
        
       

     

       192
       192
       +
       - [whoami](https://github.com/traefik/whoami), a tiny Go server that prints OS information and HTTP request to output. Available as [services.whoami](#opt-services.whoami.enable).

     

       193
       193
       +
       

     

       192
       194
        
       - [LiteLLM](https://github.com/BerriAI/litellm), a LLM Gateway to provide model access, fallbacks and spend tracking across 100+ LLMs. All in the OpenAI format. Available as [services.litellm](#opt-services.litellm.enable).

     

       193
       195
        
       

     

       194
       196
        
       - [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard).

nixos/modules/module-list.nix

···

       1639
       1639
        
         ./services/web-apps/wakapi.nix

     

       1640
       1640
        
         ./services/web-apps/weblate.nix

     

       1641
       1641
        
         ./services/web-apps/whitebophir.nix

     

       1642
       1642
       +
         ./services/web-apps/whoami.nix

     

       1642
       1643
        
         ./services/web-apps/wiki-js.nix

     

       1643
       1644
        
         ./services/web-apps/windmill.nix

     

       1644
       1645
        
         ./services/web-apps/wordpress.nix

+90

nixos/modules/services/web-apps/whoami.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.services.whoami;

     

       10
       10
       +
       in

     

       11
       11
       +
       

     

       12
       12
       +
       {

     

       13
       13
       +
         meta.maintainers = with lib.maintainers; [ defelo ];

     

       14
       14
       +
       

     

       15
       15
       +
         options.services.whoami = {

     

       16
       16
       +
           enable = lib.mkEnableOption "whoami";

     

       17
       17
       +
       

     

       18
       18
       +
           package = lib.mkPackageOption pkgs "whoami" { };

     

       19
       19
       +
       

     

       20
       20
       +
           port = lib.mkOption {

     

       21
       21
       +
             type = lib.types.port;

     

       22
       22
       +
             description = "The port whoami should listen on.";

     

       23
       23
       +
             default = 8000;

     

       24
       24
       +
           };

     

       25
       25
       +
       

     

       26
       26
       +
           extraArgs = lib.mkOption {

     

       27
       27
       +
             type = lib.types.listOf lib.types.str;

     

       28
       28
       +
             description = "Extra command line arguments to pass to whoami. See <https://github.com/traefik/whoami#flags> for details.";

     

       29
       29
       +
             default = [ ];

     

       30
       30
       +
           };

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         config = lib.mkIf cfg.enable {

     

       34
       34
       +
           systemd.services.whoami = {

     

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

     

       36
       36
       +
       

     

       37
       37
       +
             wants = [ "network-online.target" ];

     

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

     

       39
       39
       +
       

     

       40
       40
       +
             serviceConfig = {

     

       41
       41
       +
               User = "whoami";

     

       42
       42
       +
               Group = "whoami";

     

       43
       43
       +
               DynamicUser = true;

     

       44
       44
       +
               ExecStart = lib.escapeShellArgs (

     

       45
       45
       +
                 [

     

       46
       46
       +
                   (lib.getExe cfg.package)

     

       47
       47
       +
                   "-port"

     

       48
       48
       +
                   cfg.port

     

       49
       49
       +
                 ]

     

       50
       50
       +
                 ++ cfg.extraArgs

     

       51
       51
       +
               );

     

       52
       52
       +
       

     

       53
       53
       +
               # Hardening

     

       54
       54
       +
               AmbientCapabilities = "";

     

       55
       55
       +
               CapabilityBoundingSet = [ "" ];

     

       56
       56
       +
               DevicePolicy = "closed";

     

       57
       57
       +
               LockPersonality = true;

     

       58
       58
       +
               MemoryDenyWriteExecute = true;

     

       59
       59
       +
               NoNewPrivileges = true;

     

       60
       60
       +
               PrivateDevices = true;

     

       61
       61
       +
               PrivateTmp = true;

     

       62
       62
       +
               PrivateUsers = true;

     

       63
       63
       +
               ProcSubset = "pid";

     

       64
       64
       +
               ProtectClock = true;

     

       65
       65
       +
               ProtectControlGroups = true;

     

       66
       66
       +
               ProtectHome = true;

     

       67
       67
       +
               ProtectHostname = true;

     

       68
       68
       +
               ProtectKernelLogs = true;

     

       69
       69
       +
               ProtectKernelModules = true;

     

       70
       70
       +
               ProtectKernelTunables = true;

     

       71
       71
       +
               ProtectProc = "invisible";

     

       72
       72
       +
               ProtectSystem = "strict";

     

       73
       73
       +
               RemoveIPC = true;

     

       74
       74
       +
               RestrictAddressFamilies = [ "AF_INET AF_INET6" ];

     

       75
       75
       +
               RestrictNamespaces = true;

     

       76
       76
       +
               RestrictRealtime = true;

     

       77
       77
       +
               RestrictSUIDSGID = true;

     

       78
       78
       +
               SocketBindAllow = "tcp:${toString cfg.port}";

     

       79
       79
       +
               SocketBindDeny = "any";

     

       80
       80
       +
               SystemCallArchitectures = "native";

     

       81
       81
       +
               SystemCallFilter = [

     

       82
       82
       +
                 "@system-service"

     

       83
       83
       +
                 "~@privileged"

     

       84
       84
       +
                 "~@resources"

     

       85
       85
       +
               ];

     

       86
       86
       +
               UMask = "0077";

     

       87
       87
       +
             };

     

       88
       88
       +
           };

     

       89
       89
       +
         };

     

       90
       90
       +
       }

nixos/tests/all-tests.nix

···

       1446
       1446
        
         webhook = runTest ./webhook.nix;

     

       1447
       1447
        
         weblate = handleTest ./web-apps/weblate.nix { };

     

       1448
       1448
        
         whisparr = handleTest ./whisparr.nix { };

     

       1449
       1449
       +
         whoami = runTest ./whoami.nix;

     

       1449
       1450
        
         whoogle-search = handleTest ./whoogle-search.nix { };

     

       1450
       1451
        
         wiki-js = runTest ./wiki-js.nix;

     

       1451
       1452
        
         wine = handleTest ./wine.nix { };

+32

nixos/tests/whoami.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "echoip";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ defelo ];

     

       6
       6
       +
       

     

       7
       7
       +
         nodes.machine = {

     

       8
       8
       +
           services.whoami.enable = true;

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         interactive.nodes.machine = {

     

       12
       12
       +
           networking.firewall.allowedTCPPorts = [ 8000 ];

     

       13
       13
       +
           virtualisation.forwardPorts = [

     

       14
       14
       +
             {

     

       15
       15
       +
               from = "host";

     

       16
       16
       +
               host.port = 8000;

     

       17
       17
       +
               guest.port = 8000;

     

       18
       18
       +
             }

     

       19
       19
       +
           ];

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         testScript = ''

     

       23
       23
       +
           import re

     

       24
       24
       +
       

     

       25
       25
       +
           machine.wait_for_unit("whoami.service")

     

       26
       26
       +
           machine.wait_for_open_port(8000)

     

       27
       27
       +
       

     

       28
       28
       +
           response = machine.succeed("curl -H 'X-Test-Header: Hello World!' http://127.0.0.1:8000/test")

     

       29
       29
       +
           assert re.search(r"^GET /test", response, re.M)

     

       30
       30
       +
           assert re.search(r"^X-Test-Header: Hello World!", response, re.M)

     

       31
       31
       +
         '';

     

       32
       32
       +
       }

+23 -6

pkgs/by-name/wh/whoami/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         nixosTests,

     

       6
       6
       +
         nix-update-script,

     

       5
       7
        
       }:

     

       6
       8
        
       

     

       7
       7
       -
       buildGoModule rec {

     

       9
       9
       +
       buildGoModule (finalAttrs: {

     

       8
       10
        
         pname = "whoami";

     

       9
       11
        
         version = "1.11.0";

     

       10
       12
        
       

     

       11
       13
        
         src = fetchFromGitHub {

     

       12
       14
        
           owner = "traefik";

     

       13
       15
        
           repo = "whoami";

     

       14
       14
       -
           rev = "v${version}";

     

       16
       16
       +
           tag = "v${finalAttrs.version}";

     

       15
       17
        
           hash = "sha256-3jzLdCmmts/7S1Oxig9Dg3kRGh/H5l5UD7ztev0yvXY=";

     

       16
       18
        
         };

     

       17
       19
        
       

     
···

       21
       23
        
       

     

       22
       24
        
         env.CGO_ENABLED = 0;

     

       23
       25
        
       

     

       24
       24
       -
         doCheck = false;

     

       26
       26
       +
         doInstallCheck = true;

     

       27
       27
       +
         installCheckPhase = ''

     

       28
       28
       +
           runHook preInstallCheck

     

       29
       29
       +
       

     

       30
       30
       +
           $out/bin/whoami --help 2> /dev/null

     

       31
       31
       +
       

     

       32
       32
       +
           runHook postInstallCheck

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         passthru = {

     

       36
       36
       +
           tests = { inherit (nixosTests) whoami; };

     

       37
       37
       +
           updateScript = nix-update-script { };

     

       38
       38
       +
         };

     

       25
       39
        
       

     

       26
       40
        
         meta = {

     

       27
       41
        
           description = "Tiny Go server that prints os information and HTTP request to output";

     

       28
       42
        
           mainProgram = "whoami";

     

       29
       43
        
           homepage = "https://github.com/traefik/whoami";

     

       30
       30
       -
           changelog = "https://github.com/traefik/whoami/releases/tag/v${version}";

     

       44
       44
       +
           changelog = "https://github.com/traefik/whoami/releases/tag/v${finalAttrs.version}";

     

       31
       45
        
           license = lib.licenses.asl20;

     

       32
       32
       -
           maintainers = with lib.maintainers; [ dvcorreia ];

     

       46
       46
       +
           maintainers = with lib.maintainers; [

     

       47
       47
       +
             dvcorreia

     

       48
       48
       +
             defelo

     

       49
       49
       +
           ];

     

       33
       50
        
         };

     

       34
       34
       -
       }

     

       51
       51
       +
       })