commit 4def9a762f091ec1fdf048066af3fce75bb5a305 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/config/krb5.nix

···

       32
        
       

     

       33
        
             kdc = mkOption {

     

       34
        
               default = "kerberos.mit.edu";

     

       35
       -
               description = "Kerberos Domain Controller";

     

       36
        
             };

     

       37
        
       

     

       38
        
             kerberosAdminServer = mkOption {

     

       39
        
               default = "kerberos.mit.edu";

     

       40
       -
               description = "Kerberos Admin Server";

     

       41
        
             };

     

       42
        
       

     

       43
        
           };

···

       32
        
       

     

       33
        
             kdc = mkOption {

     

       34
        
               default = "kerberos.mit.edu";

     

       35
       +
               description = "Kerberos Domain Controller.";

     

       36
        
             };

     

       37
        
       

     

       38
        
             kerberosAdminServer = mkOption {

     

       39
        
               default = "kerberos.mit.edu";

     

       40
       +
               description = "Kerberos Admin Server.";

     

       41
        
             };

     

       42
        
       

     

       43
        
           };

+1 -1

nixos/modules/programs/atop.nix

···

       22
        
                 interval = 5;

     

       23
        
               };

     

       24
        
               description = ''

     

       25
       -
                 Parameters to be written to <filename>/etc/atoprc</filename>

     

       26
        
               '';

     

       27
        
             };

     

       28

···

       22
        
                 interval = 5;

     

       23
        
               };

     

       24
        
               description = ''

     

       25
       +
                 Parameters to be written to <filename>/etc/atoprc</filename>.

     

       26
        
               '';

     

       27
        
             };

     

       28

+12 -12

nixos/modules/services/databases/redis.nix

···

       50
        
       

     

       51
        
             user = mkOption {

     

       52
        
               default = "redis";

     

       53
       -
               description = "User account under which Redis runs";

     

       54
        
             };

     

       55
        
       

     

       56
        
             pidFile = mkOption {

     
···

       60
        
       

     

       61
        
             port = mkOption {

     

       62
        
               default = 6379;

     

       63
       -
               description = "The port for Redis to listen to";

     

       64
        
               type = with types; int;

     

       65
        
             };

     

       66
        
       

     

       67
        
             bind = mkOption {

     

       68
        
               default = null; # All interfaces

     

       69
       -
               description = "The IP interface to bind to";

     

       70
        
               example = "127.0.0.1";

     

       71
        
             };

     

       72
        
       

     

       73
        
             unixSocket = mkOption {

     

       74
        
               default = null;

     

       75
       -
               description = "The path to the socket to bind to";

     

       76
        
               example = "/var/run/redis.sock";

     

       77
        
             };

     

       78
        
       

     

       79
        
             logLevel = mkOption {

     

       80
        
               default = "notice"; # debug, verbose, notice, warning

     

       81
        
               example = "debug";

     

       82
       -
               description = "Specify the server verbosity level, options: debug, verbose, notice, warning";

     

       83
        
               type = with types; string;

     

       84
        
             };

     

       85
        
       

     
···

       110
        
       

     

       111
        
             dbFilename = mkOption {

     

       112
        
               default = "dump.rdb";

     

       113
       -
               description = "The filename where to dump the DB";

     

       114
        
               type = with types; string;

     

       115
        
             };

     

       116
        
       

     

       117
        
             dbpath = mkOption {

     

       118
        
               default = "/var/lib/redis";

     

       119
       -
               description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration";

     

       120
        
               type = with types; string;

     

       121
        
             };

     

       122
        
       

     

       123
        
             slaveOf = mkOption {

     

       124
        
               default = null; # { ip, port }

     

       125
       -
               description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave";

     

       126
        
               example = { ip = "192.168.1.100"; port = 6379; };

     

       127
        
             };

     

       128
        
       

     
···

       154
        
       

     

       155
        
             appendFsync = mkOption {

     

       156
        
               default = "everysec"; # no, always, everysec

     

       157
       -
               description = "How often to fsync the append-only log, options: no, always, everysec";

     

       158
        
               type = with types; string;

     

       159
        
             };

     

       160
        
       

     

       161
        
             slowLogLogSlowerThan = mkOption {

     

       162
        
               default = 10000;

     

       163
       -
               description = "Log queries whose execution take longer than X in milliseconds";

     

       164
        
               example = 1000;

     

       165
        
               type = with types; int;

     

       166
        
             };

     

       167
        
       

     

       168
        
             slowLogMaxLen = mkOption {

     

       169
        
               default = 128;

     

       170
       -
               description = "Maximum number of items to keep in slow log";

     

       171
        
               type = with types; int;

     

       172
        
             };

     

       173
        
       

     

       174
        
             extraConfig = mkOption {

     

       175
        
               default = "";

     

       176
       -
               description = "Extra configuration options for redis.conf";

     

       177
        
               type = with types; string;

     

       178
        
             };

     

       179
        
           };

···

       50
        
       

     

       51
        
             user = mkOption {

     

       52
        
               default = "redis";

     

       53
       +
               description = "User account under which Redis runs.";

     

       54
        
             };

     

       55
        
       

     

       56
        
             pidFile = mkOption {

     
···

       60
        
       

     

       61
        
             port = mkOption {

     

       62
        
               default = 6379;

     

       63
       +
               description = "The port for Redis to listen to.";

     

       64
        
               type = with types; int;

     

       65
        
             };

     

       66
        
       

     

       67
        
             bind = mkOption {

     

       68
        
               default = null; # All interfaces

     

       69
       +
               description = "The IP interface to bind to.";

     

       70
        
               example = "127.0.0.1";

     

       71
        
             };

     

       72
        
       

     

       73
        
             unixSocket = mkOption {

     

       74
        
               default = null;

     

       75
       +
               description = "The path to the socket to bind to.";

     

       76
        
               example = "/var/run/redis.sock";

     

       77
        
             };

     

       78
        
       

     

       79
        
             logLevel = mkOption {

     

       80
        
               default = "notice"; # debug, verbose, notice, warning

     

       81
        
               example = "debug";

     

       82
       +
               description = "Specify the server verbosity level, options: debug, verbose, notice, warning.";

     

       83
        
               type = with types; string;

     

       84
        
             };

     

       85
        
       

     
···

       110
        
       

     

       111
        
             dbFilename = mkOption {

     

       112
        
               default = "dump.rdb";

     

       113
       +
               description = "The filename where to dump the DB.";

     

       114
        
               type = with types; string;

     

       115
        
             };

     

       116
        
       

     

       117
        
             dbpath = mkOption {

     

       118
        
               default = "/var/lib/redis";

     

       119
       +
               description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";

     

       120
        
               type = with types; string;

     

       121
        
             };

     

       122
        
       

     

       123
        
             slaveOf = mkOption {

     

       124
        
               default = null; # { ip, port }

     

       125
       +
               description = "An attribute set with two attributes: ip and port to which this redis instance acts as a slave.";

     

       126
        
               example = { ip = "192.168.1.100"; port = 6379; };

     

       127
        
             };

     

       128
        
       

     
···

       154
        
       

     

       155
        
             appendFsync = mkOption {

     

       156
        
               default = "everysec"; # no, always, everysec

     

       157
       +
               description = "How often to fsync the append-only log, options: no, always, everysec.";

     

       158
        
               type = with types; string;

     

       159
        
             };

     

       160
        
       

     

       161
        
             slowLogLogSlowerThan = mkOption {

     

       162
        
               default = 10000;

     

       163
       +
               description = "Log queries whose execution take longer than X in milliseconds.";

     

       164
        
               example = 1000;

     

       165
        
               type = with types; int;

     

       166
        
             };

     

       167
        
       

     

       168
        
             slowLogMaxLen = mkOption {

     

       169
        
               default = 128;

     

       170
       +
               description = "Maximum number of items to keep in slow log.";

     

       171
        
               type = with types; int;

     

       172
        
             };

     

       173
        
       

     

       174
        
             extraConfig = mkOption {

     

       175
        
               default = "";

     

       176
       +
               description = "Extra configuration options for redis.conf.";

     

       177
        
               type = with types; string;

     

       178
        
             };

     

       179
        
           };

+4 -4

nixos/modules/tasks/encrypted-devices.nix

···

       16
        
             enable = mkOption {

     

       17
        
               default = false;

     

       18
        
               type = types.bool;

     

       19
       -
               description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry";

     

       20
        
             };

     

       21
        
       

     

       22
        
             blkDev = mkOption {

     

       23
        
               default = null;

     

       24
        
               example = "/dev/sda1";

     

       25
        
               type = types.uniq (types.nullOr types.string);

     

       26
       -
               description = "Location of the backing encrypted device";

     

       27
        
             };

     

       28
        
       

     

       29
        
             label = mkOption {

     

       30
        
               default = null;

     

       31
        
               example = "rootfs";

     

       32
        
               type = types.uniq (types.nullOr types.string);

     

       33
       -
               description = "Label of the backing encrypted device";

     

       34
        
             };

     

       35
        
       

     

       36
        
             keyFile = mkOption {

     

       37
        
               default = null;

     

       38
        
               example = "/root/.swapkey";

     

       39
        
               type = types.uniq (types.nullOr types.string);

     

       40
       -
               description = "File system location of keyfile";

     

       41
        
             };

     

       42
        
           };

     

       43
        
         };

···

       16
        
             enable = mkOption {

     

       17
        
               default = false;

     

       18
        
               type = types.bool;

     

       19
       +
               description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry.";

     

       20
        
             };

     

       21
        
       

     

       22
        
             blkDev = mkOption {

     

       23
        
               default = null;

     

       24
        
               example = "/dev/sda1";

     

       25
        
               type = types.uniq (types.nullOr types.string);

     

       26
       +
               description = "Location of the backing encrypted device.";

     

       27
        
             };

     

       28
        
       

     

       29
        
             label = mkOption {

     

       30
        
               default = null;

     

       31
        
               example = "rootfs";

     

       32
        
               type = types.uniq (types.nullOr types.string);

     

       33
       +
               description = "Label of the backing encrypted device.";

     

       34
        
             };

     

       35
        
       

     

       36
        
             keyFile = mkOption {

     

       37
        
               default = null;

     

       38
        
               example = "/root/.swapkey";

     

       39
        
               type = types.uniq (types.nullOr types.string);

     

       40
       +
               description = "File system location of keyfile.";

     

       41
        
             };

     

       42
        
           };

     

       43
        
         };