commit a8880f1647e6b8e83f1f9909bea17d4c0dbe8428 · pyrox.dev/nixpkgs

+25 -7

nixos/modules/services/web-servers/ttyd.nix

···

       62
       62
        
             username = mkOption {

     

       63
       63
        
               type = types.nullOr types.str;

     

       64
       64
        
               default = null;

     

       65
       65
       -
               description = "Username for basic authentication.";

     

       65
       65
       +
               description = "Username for basic http authentication.";

     

       66
       66
        
             };

     

       67
       67
        
       

     

       68
       68
        
             passwordFile = mkOption {

     
···

       70
       70
        
               default = null;

     

       71
       71
        
               apply = value: if value == null then null else toString value;

     

       72
       72
        
               description = ''

     

       73
       73
       -
                 File containing the password to use for basic authentication.

     

       73
       73
       +
                 File containing the password to use for basic http authentication.

     

       74
       74
        
                 For insecurely putting the password in the globally readable store use

     

       75
       75
        
                 `pkgs.writeText "ttydpw" "MyPassword"`.

     

       76
       76
        
               '';

     
···

       80
       80
        
               type = types.ints.u8;

     

       81
       81
        
               default = 1;

     

       82
       82
        
               description = "Signal to send to the command on session close.";

     

       83
       83
       +
             };

     

       84
       84
       +
       

     

       85
       85
       +
             entrypoint = mkOption {

     

       86
       86
       +
               type = types.listOf types.str;

     

       87
       87
       +
               default = [ "${pkgs.shadow}/bin/login" ];

     

       88
       88
       +
               defaultText = lib.literalExpression ''

     

       89
       89
       +
                 [ "''${pkgs.shadow}/bin/login" ]

     

       90
       90
       +
               '';

     

       91
       91
       +
               example = lib.literalExpression ''

     

       92
       92
       +
                 [ (lib.getExe pkgs.htop) ]

     

       93
       93
       +
               '';

     

       94
       94
       +
               description = "Which command ttyd runs.";

     

       95
       95
       +
               apply = lib.escapeShellArgs;

     

       96
       96
       +
             };

     

       97
       97
       +
       

     

       98
       98
       +
             user = mkOption {

     

       99
       99
       +
               type = types.str;

     

       100
       100
       +
               # `login` needs to be run as root

     

       101
       101
       +
               default = "root";

     

       102
       102
       +
               description = "Which unix user ttyd should run as.";

     

       83
       103
        
             };

     

       84
       104
        
       

     

       85
       105
        
             writeable = mkOption {

     
···

       193
       213
        
             wantedBy = [ "multi-user.target" ];

     

       194
       214
        
       

     

       195
       215
        
             serviceConfig = {

     

       196
       196
       -
               # Runs login which needs to be run as root

     

       197
       197
       -
               # login: Cannot possibly work without effective root

     

       198
       198
       -
               User = "root";

     

       216
       216
       +
               User = cfg.user;

     

       199
       217
        
               LoadCredential = lib.optionalString (cfg.passwordFile != null) "TTYD_PASSWORD_FILE:${cfg.passwordFile}";

     

       200
       218
        
             };

     

       201
       219
        
       

     
···

       203
       221
        
               PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/TTYD_PASSWORD_FILE")

     

       204
       222
        
               ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \

     

       205
       223
        
                 --credential ${lib.escapeShellArg cfg.username}:"$PASSWORD" \

     

       206
       206
       -
                 ${pkgs.shadow}/bin/login

     

       224
       224
       +
                 ${cfg.entrypoint}

     

       207
       225
        
             ''

     

       208
       226
        
             else ''

     

       209
       227
        
               ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \

     

       210
       210
       -
                 ${pkgs.shadow}/bin/login

     

       228
       228
       +
                 ${cfg.entrypoint}

     

       211
       229
        
             '';

     

       212
       230
        
           };

     

       213
       231
        
         };

+1 -2

nixos/tests/web-servers/ttyd.nix

···

       5
       5
        
         nodes.readonly = { pkgs, ... }: {

     

       6
       6
        
           services.ttyd = {

     

       7
       7
        
             enable = true;

     

       8
       8
       -
             username = "foo";

     

       9
       9
       -
             passwordFile = pkgs.writeText "password" "bar";

     

       8
       8
       +
             entrypoint = [ (lib.getExe pkgs.htop) ];

     

       10
       9
        
             writeable = false;

     

       11
       10
        
           };

     

       12
       11
        
         };