commit 7e80c42b0ead918defafb92893c605983319e418 · pyrox.dev/nixpkgs

+1 -1

lib/types.nix

···

       261
       261
        
           # declarations from the ‘options’ attribute of containing option

     

       262
       262
        
           # declaration.

     

       263
       263
        
           optionSet = mkOptionType {

     

       264
       264
       -
             name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";

     

       264
       264
       +
             name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set";

     

       265
       265
        
           };

     

       266
       266
        
       

     

       267
       267
        
           # Augment the given type with an additional type check function.

+30 -30

nixos/modules/config/users-groups.nix

···

       131
       131
        
             };

     

       132
       132
        
       

     

       133
       133
        
             subUidRanges = mkOption {

     

       134
       134
       -
               type = types.listOf types.optionSet;

     

       134
       134
       +
               type = with types; listOf (submodule subordinateUidRange);

     

       135
       135
        
               default = [];

     

       136
       136
        
               example = [

     

       137
       137
        
                 { startUid = 1000; count = 1; }

     

       138
       138
        
                 { startUid = 100001; count = 65534; }

     

       139
       139
        
               ];

     

       140
       140
       -
               options = [ subordinateUidRange ];

     

       141
       140
        
               description = ''

     

       142
       141
        
                 Subordinate user ids that user is allowed to use.

     

       143
       142
        
                 They are set into <filename>/etc/subuid</filename> and are used

     
···

       146
       145
        
             };

     

       147
       146
        
       

     

       148
       147
        
             subGidRanges = mkOption {

     

       149
       149
       -
               type = types.listOf types.optionSet;

     

       148
       148
       +
               type = with types; listOf (submodule subordinateGidRange);

     

       150
       149
        
               default = [];

     

       151
       150
        
               example = [

     

       152
       151
        
                 { startGid = 100; count = 1; }

     

       153
       152
        
                 { startGid = 1001; count = 999; }

     

       154
       153
        
               ];

     

       155
       155
       -
               options = [ subordinateGidRange ];

     

       156
       154
        
               description = ''

     

       157
       155
        
                 Subordinate group ids that user is allowed to use.

     

       158
       156
        
                 They are set into <filename>/etc/subgid</filename> and are used

     
···

       310
       308
        
         };

     

       311
       309
        
       

     

       312
       310
        
         subordinateUidRange = {

     

       313
       313
       -
           startUid = mkOption {

     

       314
       314
       -
             type = types.int;

     

       315
       315
       -
             description = ''

     

       316
       316
       -
               Start of the range of subordinate user ids that user is

     

       317
       317
       -
               allowed to use.

     

       318
       318
       -
             '';

     

       319
       319
       -
           };

     

       320
       320
       -
           count = mkOption {

     

       321
       321
       -
             type = types.int;

     

       322
       322
       -
             default = 1;

     

       323
       323
       -
             description = ''Count of subordinate user ids'';

     

       311
       311
       +
           options = {

     

       312
       312
       +
             startUid = mkOption {

     

       313
       313
       +
               type = types.int;

     

       314
       314
       +
               description = ''

     

       315
       315
       +
                 Start of the range of subordinate user ids that user is

     

       316
       316
       +
                 allowed to use.

     

       317
       317
       +
               '';

     

       318
       318
       +
             };

     

       319
       319
       +
             count = mkOption {

     

       320
       320
       +
               type = types.int;

     

       321
       321
       +
               default = 1;

     

       322
       322
       +
               description = ''Count of subordinate user ids'';

     

       323
       323
       +
             };

     

       324
       324
        
           };

     

       325
       325
        
         };

     

       326
       326
        
       

     

       327
       327
        
         subordinateGidRange = {

     

       328
       328
       -
           startGid = mkOption {

     

       329
       329
       -
             type = types.int;

     

       330
       330
       -
             description = ''

     

       331
       331
       -
               Start of the range of subordinate group ids that user is

     

       332
       332
       -
               allowed to use.

     

       333
       333
       -
             '';

     

       334
       334
       -
           };

     

       335
       335
       -
           count = mkOption {

     

       336
       336
       -
             type = types.int;

     

       337
       337
       -
             default = 1;

     

       338
       338
       -
             description = ''Count of subordinate group ids'';

     

       328
       328
       +
           options = {

     

       329
       329
       +
             startGid = mkOption {

     

       330
       330
       +
               type = types.int;

     

       331
       331
       +
               description = ''

     

       332
       332
       +
                 Start of the range of subordinate group ids that user is

     

       333
       333
       +
                 allowed to use.

     

       334
       334
       +
               '';

     

       335
       335
       +
             };

     

       336
       336
       +
             count = mkOption {

     

       337
       337
       +
               type = types.int;

     

       338
       338
       +
               default = 1;

     

       339
       339
       +
               description = ''Count of subordinate group ids'';

     

       340
       340
       +
             };

     

       339
       341
        
           };

     

       340
       342
        
         };

     

       341
       343
        
       

     
···

       428
       430
        
       

     

       429
       431
        
           users.users = mkOption {

     

       430
       432
        
             default = {};

     

       431
       431
       -
             type = types.loaOf types.optionSet;

     

       433
       433
       +
             type = with types; loaOf (submodule userOpts);

     

       432
       434
        
             example = {

     

       433
       435
        
               alice = {

     

       434
       436
        
                 uid = 1234;

     
···

       444
       446
        
               Additional user accounts to be created automatically by the system.

     

       445
       447
        
               This can also be used to set options for root.

     

       446
       448
        
             '';

     

       447
       447
       -
             options = [ userOpts ];

     

       448
       449
        
           };

     

       449
       450
        
       

     

       450
       451
        
           users.groups = mkOption {

     
···

       453
       454
        
               { students.gid = 1001;

     

       454
       455
        
                 hackers = { };

     

       455
       456
        
               };

     

       456
       456
       -
             type = types.loaOf types.optionSet;

     

       457
       457
       +
             type = with types; loaOf (submodule groupOpts);

     

       457
       458
        
             description = ''

     

       458
       459
        
               Additional groups to be created automatically by the system.

     

       459
       460
        
             '';

     

       460
       460
       -
             options = [ groupOpts ];

     

       461
       461
        
           };

     

       462
       462
        
       

     

       463
       463
        
           # FIXME: obsolete - will remove.

+1 -2

nixos/modules/security/acme.nix

···

       129
       129
        
       

     

       130
       130
        
             certs = mkOption {

     

       131
       131
        
               default = { };

     

       132
       132
       -
               type = types.loaOf types.optionSet;

     

       132
       132
       +
               type = with types; loaOf (submodule certOpts);

     

       133
       133
        
               description = ''

     

       134
       134
        
                 Attribute set of certificates to get signed and renewed.

     

       135
       135
        
               '';

     

       136
       136
       -
               options = [ certOpts ];

     

       137
       136
        
               example = {

     

       138
       137
        
                 "example.com" = {

     

       139
       138
        
                   webroot = "/var/www/challenges/";

+1 -2

nixos/modules/security/pam.nix

···

       386
       386
        
       

     

       387
       387
        
           security.pam.services = mkOption {

     

       388
       388
        
             default = [];

     

       389
       389
       -
             type = types.loaOf types.optionSet;

     

       390
       390
       -
             options = [ pamOpts ];

     

       389
       389
       +
             type = with types; loaOf (submodule pamOpts);

     

       391
       390
        
             description =

     

       392
       391
        
               ''

     

       393
       392
        
                 This option defines the PAM services.  A service typically

+3 -6

nixos/modules/services/backup/bacula.nix

···

       198
       198
        
               description = ''

     

       199
       199
        
                 This option defines director resources in Bacula File Daemon.

     

       200
       200
        
               '';

     

       201
       201
       -
               type = types.attrsOf types.optionSet;

     

       202
       202
       -
               options = [ directorOptions ];

     

       201
       201
       +
               type = with types; attrsOf (submodule directorOptions);

     

       203
       202
        
             };

     

       204
       203
        
       

     

       205
       204
        
             extraClientConfig = mkOption {

     
···

       253
       252
        
               description = ''

     

       254
       253
        
                 This option defines Director resources in Bacula Storage Daemon.

     

       255
       254
        
               '';

     

       256
       256
       -
               type = types.attrsOf types.optionSet;

     

       257
       257
       -
               options = [ directorOptions ];

     

       255
       255
       +
               type = with types; attrsOf (submodule directorOptions);

     

       258
       256
        
             };

     

       259
       257
        
       

     

       260
       258
        
             device = mkOption {

     
···

       262
       260
        
               description = ''

     

       263
       261
        
                 This option defines Device resources in Bacula Storage Daemon.

     

       264
       262
        
               '';

     

       265
       265
       -
               type = types.attrsOf types.optionSet;

     

       266
       266
       -
               options = [ deviceOptions ];

     

       263
       263
       +
               type = with types; attrsOf (submodule deviceOptions);

     

       267
       264
        
             };

     

       268
       265
        
        

     

       269
       266
        
             extraStorageConfig = mkOption {

+2 -3

nixos/modules/services/hardware/sane_extra_backends/brscan4.nix

···

       81
       81
        
               { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; };

     

       82
       82
        
                 office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; };

     

       83
       83
        
               };

     

       84
       84
       -
             type = types.loaOf types.optionSet;

     

       84
       84
       +
             type = with types; loaOf (submodule netDeviceOpts);

     

       85
       85
        
             description = ''

     

       86
       86
        
               The list of network devices that will be registered against the brscan4

     

       87
       87
        
               sane backend.

     

       88
       88
        
             '';

     

       89
       89
       -
             options = [ netDeviceOpts ];

     

       90
       89
        
           };

     

       91
       90
        
         };

     

       92
       91
        
       

     
···

       113
       112
        
           ];

     

       114
       113
        
       

     

       115
       114
        
         };

     

       116
       116
       -
       }
     

       115
       115
       +
       }

+35 -33

nixos/modules/services/logging/logcheck.nix

···

       62
       62
        
         };

     

       63
       63
        
       

     

       64
       64
        
         ignoreOptions = {

     

       65
       65
       -
           level = levelOption;

     

       65
       65
       +
           options = {

     

       66
       66
       +
             level = levelOption;

     

       66
       67
        
       

     

       67
       67
       -
           regex = mkOption {

     

       68
       68
       -
             default = "";

     

       69
       69
       -
             type = types.str;

     

       70
       70
       -
             description = ''

     

       71
       71
       -
               Regex specifying which log lines to ignore.

     

       72
       72
       -
             '';

     

       68
       68
       +
             regex = mkOption {

     

       69
       69
       +
               default = "";

     

       70
       70
       +
               type = types.str;

     

       71
       71
       +
               description = ''

     

       72
       72
       +
                 Regex specifying which log lines to ignore.

     

       73
       73
       +
               '';

     

       74
       74
       +
             };

     

       73
       75
        
           };

     

       74
       76
        
         };

     

       75
       77
        
       

     

       76
       78
        
         ignoreCronOptions = {

     

       77
       77
       -
           user = mkOption {

     

       78
       78
       -
             default = "root";

     

       79
       79
       -
             type = types.str;

     

       80
       80
       -
             description = ''

     

       81
       81
       -
               User that runs the cronjob.

     

       82
       82
       -
             '';

     

       83
       83
       -
           };

     

       79
       79
       +
           options = {

     

       80
       80
       +
             user = mkOption {

     

       81
       81
       +
               default = "root";

     

       82
       82
       +
               type = types.str;

     

       83
       83
       +
               description = ''

     

       84
       84
       +
                 User that runs the cronjob.

     

       85
       85
       +
               '';

     

       86
       86
       +
             };

     

       84
       87
        
       

     

       85
       85
       -
           cmdline = mkOption {

     

       86
       86
       -
             default = "";

     

       87
       87
       -
             type = types.str;

     

       88
       88
       -
             description = ''

     

       89
       89
       -
               Command line for the cron job. Will be turned into a regex for the logcheck ignore rule.

     

       90
       90
       -
             '';

     

       91
       91
       -
           };

     

       88
       88
       +
             cmdline = mkOption {

     

       89
       89
       +
               default = "";

     

       90
       90
       +
               type = types.str;

     

       91
       91
       +
               description = ''

     

       92
       92
       +
                 Command line for the cron job. Will be turned into a regex for the logcheck ignore rule.

     

       93
       93
       +
               '';

     

       94
       94
       +
             };

     

       92
       95
        
       

     

       93
       93
       -
           timeArgs = mkOption {

     

       94
       94
       -
             default = null;

     

       95
       95
       -
             type = types.nullOr (types.str);

     

       96
       96
       -
             example = "02 06 * * *";

     

       97
       97
       -
             description = ''

     

       98
       98
       -
               "min hr dom mon dow" crontab time args, to auto-create a cronjob too.

     

       99
       99
       -
               Leave at null to not do this and just add a logcheck ignore rule.

     

       100
       100
       -
             '';

     

       96
       96
       +
             timeArgs = mkOption {

     

       97
       97
       +
               default = null;

     

       98
       98
       +
               type = types.nullOr (types.str);

     

       99
       99
       +
               example = "02 06 * * *";

     

       100
       100
       +
               description = ''

     

       101
       101
       +
                 "min hr dom mon dow" crontab time args, to auto-create a cronjob too.

     

       102
       102
       +
                 Leave at null to not do this and just add a logcheck ignore rule.

     

       103
       103
       +
               '';

     

       104
       104
       +
             };

     

       101
       105
        
           };

     

       102
       106
        
         };

     

       103
       107
        
       

     
···

       180
       184
        
               description = ''

     

       181
       185
        
                 This option defines extra ignore rules.

     

       182
       186
        
               '';

     

       183
       183
       -
               type = types.loaOf types.optionSet;

     

       184
       184
       -
               options = [ ignoreOptions ];

     

       187
       187
       +
               type = with types; loaOf (submodule ignoreOptions);

     

       185
       188
        
             };

     

       186
       189
        
       

     

       187
       190
        
             ignoreCron = mkOption {

     
···

       189
       192
        
               description = ''

     

       190
       193
        
                 This option defines extra ignore rules for cronjobs.

     

       191
       194
        
               '';

     

       192
       192
       -
               type = types.loaOf types.optionSet;

     

       193
       193
       -
               options = [ ignoreOptions ignoreCronOptions ];

     

       195
       195
       +
               type = with types; loaOf (submodule ignoreCronOptions);

     

       194
       196
        
             };

     

       195
       197
        
       

     

       196
       198
        
             extraGroups = mkOption {

+38 -40

nixos/modules/services/misc/rippled.nix

···

       154
       154
        
         };

     

       155
       155
        
       

     

       156
       156
        
         dbOptions = {

     

       157
       157
       -
           type = mkOption {

     

       158
       158
       -
             description = "Rippled database type.";

     

       159
       159
       -
             type = types.enum ["rocksdb" "nudb"];

     

       160
       160
       -
             default = "rocksdb";

     

       161
       161
       -
           };

     

       157
       157
       +
           options = {

     

       158
       158
       +
             type = mkOption {

     

       159
       159
       +
               description = "Rippled database type.";

     

       160
       160
       +
               type = types.enum ["rocksdb" "nudb"];

     

       161
       161
       +
               default = "rocksdb";

     

       162
       162
       +
             };

     

       162
       163
        
       

     

       163
       163
       -
           path = mkOption {

     

       164
       164
       -
             description = "Location to store the database.";

     

       165
       165
       -
             type = types.path;

     

       166
       166
       -
             default = cfg.databasePath;

     

       167
       167
       -
           };

     

       164
       164
       +
             path = mkOption {

     

       165
       165
       +
               description = "Location to store the database.";

     

       166
       166
       +
               type = types.path;

     

       167
       167
       +
               default = cfg.databasePath;

     

       168
       168
       +
             };

     

       168
       169
        
       

     

       169
       169
       -
           compression = mkOption {

     

       170
       170
       -
             description = "Whether to enable snappy compression.";

     

       171
       171
       -
             type = types.nullOr types.bool;

     

       172
       172
       -
             default = null;

     

       173
       173
       -
           };

     

       170
       170
       +
             compression = mkOption {

     

       171
       171
       +
               description = "Whether to enable snappy compression.";

     

       172
       172
       +
               type = types.nullOr types.bool;

     

       173
       173
       +
               default = null;

     

       174
       174
       +
             };

     

       174
       175
        
       

     

       175
       175
       -
           onlineDelete = mkOption {

     

       176
       176
       -
             description = "Enable automatic purging of older ledger information.";

     

       177
       177
       -
             type = types.addCheck (types.nullOr types.int) (v: v > 256);

     

       178
       178
       -
             default = cfg.ledgerHistory;

     

       179
       179
       -
           };

     

       176
       176
       +
             onlineDelete = mkOption {

     

       177
       177
       +
               description = "Enable automatic purging of older ledger information.";

     

       178
       178
       +
               type = types.addCheck (types.nullOr types.int) (v: v > 256);

     

       179
       179
       +
               default = cfg.ledgerHistory;

     

       180
       180
       +
             };

     

       180
       181
        
       

     

       181
       181
       -
           advisoryDelete = mkOption {

     

       182
       182
       -
             description = ''

     

       183
       183
       -
       	If set, then require administrative RPC call "can_delete"

     

       184
       184
       -
       	to enable online deletion of ledger records.

     

       185
       185
       -
             '';

     

       186
       186
       -
             type = types.nullOr types.bool;

     

       187
       187
       -
             default = null;

     

       188
       188
       -
           };

     

       182
       182
       +
             advisoryDelete = mkOption {

     

       183
       183
       +
               description = ''

     

       184
       184
       +
       	        If set, then require administrative RPC call "can_delete"

     

       185
       185
       +
       	        to enable online deletion of ledger records.

     

       186
       186
       +
               '';

     

       187
       187
       +
               type = types.nullOr types.bool;

     

       188
       188
       +
               default = null;

     

       189
       189
       +
             };

     

       189
       190
        
       

     

       190
       190
       -
           extraOpts = mkOption {

     

       191
       191
       -
             description = "Extra database options.";

     

       192
       192
       -
             type = types.lines;

     

       193
       193
       -
             default = "";

     

       191
       191
       +
             extraOpts = mkOption {

     

       192
       192
       +
               description = "Extra database options.";

     

       193
       193
       +
               type = types.lines;

     

       194
       194
       +
               default = "";

     

       195
       195
       +
             };

     

       194
       196
        
           };

     

       195
       197
        
         };

     

       196
       198
        
       

     
···

       213
       215
        
       

     

       214
       216
        
             ports = mkOption {

     

       215
       217
        
       	description = "Ports exposed by rippled";

     

       216
       216
       -
       	type = types.attrsOf types.optionSet;

     

       217
       217
       -
       	options = [portOptions];

     

       218
       218
       +
       	type = with types; attrsOf (submodule portOptions);

     

       218
       219
        
       	default = {

     

       219
       220
        
       	  rpc = {

     

       220
       221
        
       	    port = 5005;

     
···

       238
       239
        
       

     

       239
       240
        
             nodeDb = mkOption {

     

       240
       241
        
       	description = "Rippled main database options.";

     

       241
       241
       -
       	type = types.nullOr types.optionSet;

     

       242
       242
       -
       	options = dbOptions;

     

       242
       242
       +
       	type = with types; nullOr (submodule dbOptions);

     

       243
       243
        
       	default = {

     

       244
       244
        
       	  type = "rocksdb";

     

       245
       245
        
       	  extraOpts = ''

     
···

       254
       254
        
       

     

       255
       255
        
             tempDb = mkOption {

     

       256
       256
        
       	description = "Rippled temporary database options.";

     

       257
       257
       -
       	type = types.nullOr types.optionSet;

     

       258
       258
       -
       	options = dbOptions;

     

       257
       257
       +
       	type = with types; nullOr (submodule dbOptions);

     

       259
       258
        
       	default = null;

     

       260
       259
        
             };

     

       261
       260
        
       

     

       262
       261
        
             importDb = mkOption {

     

       263
       262
        
       	description = "Settings for performing a one-time import.";

     

       264
       264
       -
       	type = types.nullOr types.optionSet;

     

       265
       265
       -
       	options = dbOptions;

     

       263
       263
       +
       	type = with types; nullOr (submodule dbOptions);

     

       266
       264
        
       	default = null;

     

       267
       265
        
             };

     

       268
       266

+1 -2

nixos/modules/services/monitoring/smartd.nix

···

       197
       197
        
             devices = mkOption {

     

       198
       198
        
               default = [];

     

       199
       199
        
               example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];

     

       200
       200
       -
               type = types.listOf types.optionSet;

     

       201
       201
       -
               options = [ smartdOpts ];

     

       200
       200
       +
               type = with types; listOf (submodule smartdOpts);

     

       202
       201
        
               description = "List of devices to monitor.";

     

       203
       202
        
             };

     

       204
       203

+1 -2

nixos/modules/services/monitoring/ups.nix

···

       169
       169
        
                 monitoring directly.  These are usually attached to serial ports,

     

       170
       170
        
                 but USB devices are also supported.

     

       171
       171
        
               '';

     

       172
       172
       -
               type = types.attrsOf types.optionSet;

     

       173
       173
       -
               options = [ upsOptions ];

     

       172
       172
       +
               type = with types; attrsOf (submodule upsOptions);

     

       174
       173
        
             };

     

       175
       174
        
       

     

       176
       175
        
           };

+131 -129

nixos/modules/services/network-filesystems/tahoe.nix

···

       8
       8
        
           options.services.tahoe = {

     

       9
       9
        
             introducers = mkOption {

     

       10
       10
        
               default = {};

     

       11
       11
       -
               type = types.loaOf types.optionSet;

     

       11
       11
       +
               type = with types; loaOf (submodule {

     

       12
       12
       +
                 options = {

     

       13
       13
       +
                   nickname = mkOption {

     

       14
       14
       +
                     type = types.str;

     

       15
       15
       +
                     description = ''

     

       16
       16
       +
                       The nickname of this Tahoe introducer.

     

       17
       17
       +
                     '';

     

       18
       18
       +
                   };

     

       19
       19
       +
                   tub.port = mkOption {

     

       20
       20
       +
                     default = 3458;

     

       21
       21
       +
                     type = types.int;

     

       22
       22
       +
                     description = ''

     

       23
       23
       +
                       The port on which the introducer will listen.

     

       24
       24
       +
                     '';

     

       25
       25
       +
                   };

     

       26
       26
       +
                   tub.location = mkOption {

     

       27
       27
       +
                     default = null;

     

       28
       28
       +
                     type = types.nullOr types.str;

     

       29
       29
       +
                     description = ''

     

       30
       30
       +
                       The external location that the introducer should listen on.

     

       31
       31
       +
       

     

       32
       32
       +
                       If specified, the port should be included.

     

       33
       33
       +
                     '';

     

       34
       34
       +
                   };

     

       35
       35
       +
                   package = mkOption {

     

       36
       36
       +
                     default = pkgs.tahoelafs;

     

       37
       37
       +
                     defaultText = "pkgs.tahoelafs";

     

       38
       38
       +
                     type = types.package;

     

       39
       39
       +
                     example = literalExample "pkgs.tahoelafs";

     

       40
       40
       +
                     description = ''

     

       41
       41
       +
                       The package to use for the Tahoe LAFS daemon.

     

       42
       42
       +
                     '';

     

       43
       43
       +
                   };

     

       44
       44
       +
                 };

     

       45
       45
       +
               });

     

       12
       46
        
               description = ''

     

       13
       47
        
                 The Tahoe introducers.

     

       14
       48
        
               '';

     

       15
       15
       -
               options = {

     

       16
       16
       -
                 nickname = mkOption {

     

       17
       17
       -
                   type = types.str;

     

       18
       18
       -
                   description = ''

     

       19
       19
       -
                     The nickname of this Tahoe introducer.

     

       20
       20
       -
                   '';

     

       21
       21
       -
                 };

     

       22
       22
       -
                 tub.port = mkOption {

     

       23
       23
       -
                   default = 3458;

     

       24
       24
       -
                   type = types.int;

     

       25
       25
       -
                   description = ''

     

       26
       26
       -
                     The port on which the introducer will listen.

     

       27
       27
       -
                   '';

     

       28
       28
       -
                 };

     

       29
       29
       -
                 tub.location = mkOption {

     

       30
       30
       -
                   default = null;

     

       31
       31
       -
                   type = types.nullOr types.str;

     

       32
       32
       -
                   description = ''

     

       33
       33
       -
                     The external location that the introducer should listen on.

     

       34
       34
       -
       

     

       35
       35
       -
                     If specified, the port should be included.

     

       36
       36
       -
                   '';

     

       37
       37
       -
                 };

     

       38
       38
       -
                 package = mkOption {

     

       39
       39
       -
                   default = pkgs.tahoelafs;

     

       40
       40
       -
                   defaultText = "pkgs.tahoelafs";

     

       41
       41
       -
                   type = types.package;

     

       42
       42
       -
                   example = literalExample "pkgs.tahoelafs";

     

       43
       43
       -
                   description = ''

     

       44
       44
       -
                     The package to use for the Tahoe LAFS daemon.

     

       45
       45
       -
                   '';

     

       46
       46
       -
                 };

     

       47
       47
       -
               };

     

       48
       49
        
             };

     

       49
       50
        
             nodes = mkOption {

     

       50
       51
        
               default = {};

     

       51
       51
       -
               type = types.loaOf types.optionSet;

     

       52
       52
       -
               description = ''

     

       53
       53
       -
                 The Tahoe nodes.

     

       54
       54
       -
               '';

     

       55
       55
       -
               options = {

     

       56
       56
       -
                 nickname = mkOption {

     

       57
       57
       -
                   type = types.str;

     

       58
       58
       -
                   description = ''

     

       59
       59
       -
                     The nickname of this Tahoe node.

     

       60
       60
       -
                   '';

     

       61
       61
       -
                 };

     

       62
       62
       -
                 tub.port = mkOption {

     

       63
       63
       -
                   default = 3457;

     

       64
       64
       -
                   type = types.int;

     

       65
       65
       -
                   description = ''

     

       66
       66
       -
                     The port on which the tub will listen.

     

       52
       52
       +
               type = with types; loaOf (submodule {

     

       53
       53
       +
                 options = {

     

       54
       54
       +
                   nickname = mkOption {

     

       55
       55
       +
                     type = types.str;

     

       56
       56
       +
                     description = ''

     

       57
       57
       +
                       The nickname of this Tahoe node.

     

       58
       58
       +
                     '';

     

       59
       59
       +
                   };

     

       60
       60
       +
                   tub.port = mkOption {

     

       61
       61
       +
                     default = 3457;

     

       62
       62
       +
                     type = types.int;

     

       63
       63
       +
                     description = ''

     

       64
       64
       +
                       The port on which the tub will listen.

     

       67
       65
        
       

     

       68
       68
       -
                     This is the correct setting to tweak if you want Tahoe's storage

     

       69
       69
       -
                     system to listen on a different port.

     

       70
       70
       -
                   '';

     

       71
       71
       -
                 };

     

       72
       72
       -
                 tub.location = mkOption {

     

       73
       73
       -
                   default = null;

     

       74
       74
       -
                   type = types.nullOr types.str;

     

       75
       75
       -
                   description = ''

     

       76
       76
       -
                     The external location that the node should listen on.

     

       66
       66
       +
                       This is the correct setting to tweak if you want Tahoe's storage

     

       67
       67
       +
                       system to listen on a different port.

     

       68
       68
       +
                     '';

     

       69
       69
       +
                   };

     

       70
       70
       +
                   tub.location = mkOption {

     

       71
       71
       +
                     default = null;

     

       72
       72
       +
                     type = types.nullOr types.str;

     

       73
       73
       +
                     description = ''

     

       74
       74
       +
                       The external location that the node should listen on.

     

       77
       75
        
       

     

       78
       78
       -
                     This is the setting to tweak if there are multiple interfaces

     

       79
       79
       -
                     and you want to alter which interface Tahoe is advertising.

     

       76
       76
       +
                       This is the setting to tweak if there are multiple interfaces

     

       77
       77
       +
                       and you want to alter which interface Tahoe is advertising.

     

       80
       78
        
       

     

       81
       81
       -
                     If specified, the port should be included.

     

       82
       82
       -
                   '';

     

       83
       83
       -
                 };

     

       84
       84
       -
                 web.port = mkOption {

     

       85
       85
       -
                   default = 3456;

     

       86
       86
       -
                   type = types.int;

     

       87
       87
       -
                   description = ''

     

       88
       88
       -
                     The port on which the Web server will listen.

     

       79
       79
       +
                       If specified, the port should be included.

     

       80
       80
       +
                     '';

     

       81
       81
       +
                   };

     

       82
       82
       +
                   web.port = mkOption {

     

       83
       83
       +
                     default = 3456;

     

       84
       84
       +
                     type = types.int;

     

       85
       85
       +
                     description = ''

     

       86
       86
       +
                       The port on which the Web server will listen.

     

       89
       87
        
       

     

       90
       90
       -
                     This is the correct setting to tweak if you want Tahoe's WUI to

     

       91
       91
       -
                     listen on a different port.

     

       92
       92
       -
                   '';

     

       93
       93
       -
                 };

     

       94
       94
       -
                 client.introducer = mkOption {

     

       95
       95
       -
                   default = null;

     

       96
       96
       -
                   type = types.nullOr types.str;

     

       97
       97
       -
                   description = ''

     

       98
       98
       -
                     The furl for a Tahoe introducer node.

     

       88
       88
       +
                       This is the correct setting to tweak if you want Tahoe's WUI to

     

       89
       89
       +
                       listen on a different port.

     

       90
       90
       +
                     '';

     

       91
       91
       +
                   };

     

       92
       92
       +
                   client.introducer = mkOption {

     

       93
       93
       +
                     default = null;

     

       94
       94
       +
                     type = types.nullOr types.str;

     

       95
       95
       +
                     description = ''

     

       96
       96
       +
                       The furl for a Tahoe introducer node.

     

       99
       97
        
       

     

       100
       100
       -
                     Like all furls, keep this safe and don't share it.

     

       101
       101
       -
                   '';

     

       102
       102
       -
                 };

     

       103
       103
       -
                 client.helper = mkOption {

     

       104
       104
       -
                   default = null;

     

       105
       105
       -
                   type = types.nullOr types.str;

     

       106
       106
       -
                   description = ''

     

       107
       107
       -
                     The furl for a Tahoe helper node.

     

       98
       98
       +
                       Like all furls, keep this safe and don't share it.

     

       99
       99
       +
                     '';

     

       100
       100
       +
                   };

     

       101
       101
       +
                   client.helper = mkOption {

     

       102
       102
       +
                     default = null;

     

       103
       103
       +
                     type = types.nullOr types.str;

     

       104
       104
       +
                     description = ''

     

       105
       105
       +
                       The furl for a Tahoe helper node.

     

       108
       106
        
       

     

       109
       109
       -
                     Like all furls, keep this safe and don't share it.

     

       110
       110
       -
                   '';

     

       111
       111
       -
                 };

     

       112
       112
       -
                 client.shares.needed = mkOption {

     

       113
       113
       -
                   default = 3;

     

       114
       114
       -
                   type = types.int;

     

       115
       115
       -
                   description = ''

     

       116
       116
       -
                     The number of shares required to reconstitute a file.

     

       117
       117
       -
                   '';

     

       118
       118
       -
                 };

     

       119
       119
       -
                 client.shares.happy = mkOption {

     

       120
       120
       -
                   default = 7;

     

       121
       121
       -
                   type = types.int;

     

       122
       122
       -
                   description = ''

     

       123
       123
       -
                     The number of distinct storage nodes required to store

     

       124
       124
       -
                     a file.

     

       125
       125
       -
                   '';

     

       126
       126
       -
                 };

     

       127
       127
       -
                 client.shares.total = mkOption {

     

       128
       128
       -
                   default = 10;

     

       129
       129
       -
                   type = types.int;

     

       130
       130
       -
                   description = ''

     

       131
       131
       -
                     The number of shares required to store a file.

     

       132
       132
       -
                   '';

     

       133
       133
       -
                 };

     

       134
       134
       -
                 storage.enable = mkEnableOption "storage service";

     

       135
       135
       -
                 storage.reservedSpace = mkOption {

     

       136
       136
       -
                   default = "1G";

     

       137
       137
       -
                   type = types.str;

     

       138
       138
       -
                   description = ''

     

       139
       139
       -
                     The amount of filesystem space to not use for storage.

     

       140
       140
       -
                   '';

     

       141
       141
       -
                 };

     

       142
       142
       -
                 helper.enable = mkEnableOption "helper service";

     

       143
       143
       -
                 package = mkOption {

     

       144
       144
       -
                   default = pkgs.tahoelafs;

     

       145
       145
       -
                   defaultText = "pkgs.tahoelafs";

     

       146
       146
       -
                   type = types.package;

     

       147
       147
       -
                   example = literalExample "pkgs.tahoelafs";

     

       148
       148
       -
                   description = ''

     

       149
       149
       -
                     The package to use for the Tahoe LAFS daemon.

     

       150
       150
       -
                   '';

     

       107
       107
       +
                       Like all furls, keep this safe and don't share it.

     

       108
       108
       +
                     '';

     

       109
       109
       +
                   };

     

       110
       110
       +
                   client.shares.needed = mkOption {

     

       111
       111
       +
                     default = 3;

     

       112
       112
       +
                     type = types.int;

     

       113
       113
       +
                     description = ''

     

       114
       114
       +
                       The number of shares required to reconstitute a file.

     

       115
       115
       +
                     '';

     

       116
       116
       +
                   };

     

       117
       117
       +
                   client.shares.happy = mkOption {

     

       118
       118
       +
                     default = 7;

     

       119
       119
       +
                     type = types.int;

     

       120
       120
       +
                     description = ''

     

       121
       121
       +
                       The number of distinct storage nodes required to store

     

       122
       122
       +
                       a file.

     

       123
       123
       +
                     '';

     

       124
       124
       +
                   };

     

       125
       125
       +
                   client.shares.total = mkOption {

     

       126
       126
       +
                     default = 10;

     

       127
       127
       +
                     type = types.int;

     

       128
       128
       +
                     description = ''

     

       129
       129
       +
                       The number of shares required to store a file.

     

       130
       130
       +
                     '';

     

       131
       131
       +
                   };

     

       132
       132
       +
                   storage.enable = mkEnableOption "storage service";

     

       133
       133
       +
                   storage.reservedSpace = mkOption {

     

       134
       134
       +
                     default = "1G";

     

       135
       135
       +
                     type = types.str;

     

       136
       136
       +
                     description = ''

     

       137
       137
       +
                       The amount of filesystem space to not use for storage.

     

       138
       138
       +
                     '';

     

       139
       139
       +
                   };

     

       140
       140
       +
                   helper.enable = mkEnableOption "helper service";

     

       141
       141
       +
                   package = mkOption {

     

       142
       142
       +
                     default = pkgs.tahoelafs;

     

       143
       143
       +
                     defaultText = "pkgs.tahoelafs";

     

       144
       144
       +
                     type = types.package;

     

       145
       145
       +
                     example = literalExample "pkgs.tahoelafs";

     

       146
       146
       +
                     description = ''

     

       147
       147
       +
                       The package to use for the Tahoe LAFS daemon.

     

       148
       148
       +
                     '';

     

       149
       149
       +
                   };

     

       151
       150
        
                 };

     

       152
       152
       -
               };

     

       151
       151
       +
               });

     

       152
       152
       +
               description = ''

     

       153
       153
       +
                 The Tahoe nodes.

     

       154
       154
       +
               '';

     

       153
       155
        
             };

     

       154
       156
        
           };

     

       155
       157
        
           config = mkMerge [

+27 -28

nixos/modules/services/networking/i2pd.nix

···

       187
       187
        
       

     

       188
       188
        
             outTunnels = mkOption {

     

       189
       189
        
               default = {};

     

       190
       190
       -
               type = with types; loaOf optionSet;

     

       190
       190
       +
               type = with types; loaOf (submodule ( 

     

       191
       191
       +
                 { name, config, ... }: {

     

       192
       192
       +
                   options = commonTunOpts name;

     

       193
       193
       +
                   config = {

     

       194
       194
       +
                     name = mkDefault name;

     

       195
       195
       +
                   };

     

       196
       196
       +
                 }

     

       197
       197
       +
               ));

     

       191
       198
        
               description = ''

     

       192
       199
        
                 Connect to someone as a client and establish a local accept endpoint

     

       193
       200
        
               '';

     

       194
       194
       -
               options = [ ({ name, config, ... }: {

     

       195
       195
       -
                 options = commonTunOpts name;

     

       196
       196
       -
                 config = {

     

       197
       197
       -
                   name = mkDefault name;

     

       198
       198
       -
                 };

     

       199
       199
       -
               }) ];

     

       200
       201
        
             };

     

       201
       202
        
       

     

       202
       203
        
             inTunnels = mkOption {

     

       203
       204
        
               default = {};

     

       204
       204
       -
               type = with types; loaOf optionSet;

     

       205
       205
       +
               type = with types; loaOf (submodule (

     

       206
       206
       +
                 { name, config, ... }: {

     

       207
       207
       +
                   options = {

     

       208
       208
       +
                     inPort = mkOption {

     

       209
       209
       +
                       type = types.int;

     

       210
       210
       +
                       default = 0;

     

       211
       211
       +
                       description = "Service port. Default to the tunnel's listen port.";

     

       212
       212
       +
                     };

     

       213
       213
       +
                     accessList = mkOption {

     

       214
       214
       +
                       type = with types; listOf str;

     

       215
       215
       +
                       default = [];

     

       216
       216
       +
                       description = "I2P nodes that are allowed to connect to this service.";

     

       217
       217
       +
                     };

     

       218
       218
       +
                   } // commonTunOpts name;

     

       219
       219
       +
                   config = {

     

       220
       220
       +
                     name = mkDefault name;

     

       221
       221
       +
                   };

     

       222
       222
       +
                 }

     

       223
       223
       +
               ));

     

       205
       224
        
               description = ''

     

       206
       225
        
                 Serve something on I2P network at port and delegate requests to address inPort.

     

       207
       226
        
               '';

     

       208
       208
       -
               options = [ ({ name, config, ... }: {

     

       209
       209
       -
       

     

       210
       210
       -
                 options = {

     

       211
       211
       -
                   inPort = mkOption {

     

       212
       212
       -
                     type = types.int;

     

       213
       213
       -
                     default = 0;

     

       214
       214
       -
                     description = "Service port. Default to the tunnel's listen port.";

     

       215
       215
       -
                   };

     

       216
       216
       -
                   accessList = mkOption {

     

       217
       217
       -
                     type = with types; listOf str;

     

       218
       218
       -
                     default = [];

     

       219
       219
       -
                     description = "I2P nodes that are allowed to connect to this service.";

     

       220
       220
       -
                   };

     

       221
       221
       -
                 } // commonTunOpts name;

     

       222
       222
       -
       

     

       223
       223
       -
                 config = {

     

       224
       224
       -
                   name = mkDefault name;

     

       225
       225
       -
                 };

     

       226
       226
       -
       

     

       227
       227
       -
               }) ];

     

       228
       227
        
             };

     

       229
       228
        
           };

     

       230
       229
        
         };

+15 -15

nixos/modules/services/networking/nat.nix

···

       122
       122
        
           };

     

       123
       123
        
       

     

       124
       124
        
           networking.nat.forwardPorts = mkOption {

     

       125
       125
       -
             type = types.listOf types.optionSet;

     

       126
       126
       -
             default = [];

     

       127
       127
       -
             example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];

     

       128
       128
       -
             options = {

     

       129
       129
       -
               sourcePort = mkOption {

     

       130
       130
       -
                 type = types.int;

     

       131
       131
       -
                 example = 8080;

     

       132
       132
       -
                 description = "Source port of the external interface";

     

       133
       133
       -
               };

     

       125
       125
       +
             type = with types; listOf (submodule {

     

       126
       126
       +
               options = {

     

       127
       127
       +
                 sourcePort = mkOption {

     

       128
       128
       +
                   type = types.int;

     

       129
       129
       +
                   example = 8080;

     

       130
       130
       +
                   description = "Source port of the external interface";

     

       131
       131
       +
                 };

     

       134
       132
        
       

     

       135
       135
       -
               destination = mkOption {

     

       136
       136
       -
                 type = types.str;

     

       137
       137
       -
                 example = "10.0.0.1:80";

     

       138
       138
       -
                 description = "Forward tcp connection to destination ip:port";

     

       133
       133
       +
                 destination = mkOption {

     

       134
       134
       +
                   type = types.str;

     

       135
       135
       +
                   example = "10.0.0.1:80";

     

       136
       136
       +
                   description = "Forward tcp connection to destination ip:port";

     

       137
       137
       +
                 };

     

       139
       138
        
               };

     

       140
       140
       -
             };

     

       141
       141
       -
       

     

       139
       139
       +
             });

     

       140
       140
       +
             default = [];

     

       141
       141
       +
             example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];

     

       142
       142
        
             description =

     

       143
       143
        
               ''

     

       144
       144
        
                 List of forwarded ports from the external interface to

+40 -38

nixos/modules/services/networking/openvpn.nix

···

       116
       116
        
               attribute name.

     

       117
       117
        
             '';

     

       118
       118
        
       

     

       119
       119
       -
             type = types.attrsOf types.optionSet;

     

       119
       119
       +
             type = with types; attrsOf (submodule {

     

       120
       120
        
       

     

       121
       121
       -
             options = {

     

       121
       121
       +
               options = {

     

       122
       122
        
       

     

       123
       123
       -
               config = mkOption {

     

       124
       124
       -
                 type = types.lines;

     

       125
       125
       -
                 description = ''

     

       126
       126
       -
                   Configuration of this OpenVPN instance.  See

     

       127
       127
       -
                   <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>

     

       128
       128
       -
                   for details.

     

       129
       129
       -
                 '';

     

       130
       130
       -
               };

     

       123
       123
       +
                 config = mkOption {

     

       124
       124
       +
                   type = types.lines;

     

       125
       125
       +
                   description = ''

     

       126
       126
       +
                     Configuration of this OpenVPN instance.  See

     

       127
       127
       +
                     <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>

     

       128
       128
       +
                     for details.

     

       129
       129
       +
                   '';

     

       130
       130
       +
                 };

     

       131
       131
        
       

     

       132
       132
       -
               up = mkOption {

     

       133
       133
       -
                 default = "";

     

       134
       134
       -
                 type = types.lines;

     

       135
       135
       -
                 description = ''

     

       136
       136
       -
                   Shell commands executed when the instance is starting.

     

       137
       137
       -
                 '';

     

       138
       138
       -
               };

     

       132
       132
       +
                 up = mkOption {

     

       133
       133
       +
                   default = "";

     

       134
       134
       +
                   type = types.lines;

     

       135
       135
       +
                   description = ''

     

       136
       136
       +
                     Shell commands executed when the instance is starting.

     

       137
       137
       +
                   '';

     

       138
       138
       +
                 };

     

       139
       139
        
       

     

       140
       140
       -
               down = mkOption {

     

       141
       141
       -
                 default = "";

     

       142
       142
       -
                 type = types.lines;

     

       143
       143
       -
                 description = ''

     

       144
       144
       -
                   Shell commands executed when the instance is shutting down.

     

       145
       145
       -
                 '';

     

       146
       146
       -
               };

     

       140
       140
       +
                 down = mkOption {

     

       141
       141
       +
                   default = "";

     

       142
       142
       +
                   type = types.lines;

     

       143
       143
       +
                   description = ''

     

       144
       144
       +
                     Shell commands executed when the instance is shutting down.

     

       145
       145
       +
                   '';

     

       146
       146
       +
                 };

     

       147
       147
        
       

     

       148
       148
       -
               autoStart = mkOption {

     

       149
       149
       -
                 default = true;

     

       150
       150
       -
                 type = types.bool;

     

       151
       151
       -
                 description = "Whether this OpenVPN instance should be started automatically.";

     

       152
       152
       -
               };

     

       148
       148
       +
                 autoStart = mkOption {

     

       149
       149
       +
                   default = true;

     

       150
       150
       +
                   type = types.bool;

     

       151
       151
       +
                   description = "Whether this OpenVPN instance should be started automatically.";

     

       152
       152
       +
                 };

     

       153
       153
       +
       

     

       154
       154
       +
                 updateResolvConf = mkOption {

     

       155
       155
       +
                   default = false;

     

       156
       156
       +
                   type = types.bool;

     

       157
       157
       +
                   description = ''

     

       158
       158
       +
                     Use the script from the update-resolv-conf package to automatically

     

       159
       159
       +
                     update resolv.conf with the DNS information provided by openvpn. The

     

       160
       160
       +
                     script will be run after the "up" commands and before the "down" commands.

     

       161
       161
       +
                   '';

     

       162
       162
       +
                 };

     

       153
       163
        
       

     

       154
       154
       -
               updateResolvConf = mkOption {

     

       155
       155
       -
                 default = false;

     

       156
       156
       -
                 type = types.bool;

     

       157
       157
       -
                 description = ''

     

       158
       158
       -
                   Use the script from the update-resolv-conf package to automatically

     

       159
       159
       -
                   update resolv.conf with the DNS information provided by openvpn. The

     

       160
       160
       -
                   script will be run after the "up" commands and before the "down" commands.

     

       161
       161
       -
                 '';

     

       162
       164
        
               };

     

       163
       165
        
       

     

       164
       164
       -
             };

     

       166
       166
       +
             });

     

       165
       167
        
       

     

       166
       168
        
           };

     

       167
       169

+1 -2

nixos/modules/services/networking/prosody.nix

···

       164
       164
        
       

     

       165
       165
        
               description = "Define the virtual hosts";

     

       166
       166
        
       

     

       167
       167
       -
               type = types.loaOf types.optionSet;

     

       167
       167
       +
               type = with types; loaOf (submodule vHostOpts);

     

       168
       168
        
       

     

       169
       169
        
               example = {

     

       170
       170
        
                 myhost = {

     
···

       180
       180
        
                 };

     

       181
       181
        
               };

     

       182
       182
        
       

     

       183
       183
       -
               options = [ vHostOpts ];

     

       184
       183
        
             };

     

       185
       184
        
       

     

       186
       185
        
             ssl = mkOption {

+18 -17

nixos/modules/services/networking/ssh/sshd.nix

···

       129
       129
        
             };

     

       130
       130
        
       

     

       131
       131
        
             listenAddresses = mkOption {

     

       132
       132
       -
               type = types.listOf types.optionSet;

     

       132
       132
       +
               type = with types; listOf (submodule {

     

       133
       133
       +
                 options = {

     

       134
       134
       +
                   addr = mkOption {

     

       135
       135
       +
                     type = types.nullOr types.str;

     

       136
       136
       +
                     default = null;

     

       137
       137
       +
                     description = ''

     

       138
       138
       +
                       Host, IPv4 or IPv6 address to listen to.

     

       139
       139
       +
                     '';

     

       140
       140
       +
                   };

     

       141
       141
       +
                   port = mkOption {

     

       142
       142
       +
                     type = types.nullOr types.int;

     

       143
       143
       +
                     default = null;

     

       144
       144
       +
                     description = ''

     

       145
       145
       +
                       Port to listen to.

     

       146
       146
       +
                     '';

     

       147
       147
       +
                   };

     

       148
       148
       +
                 };

     

       149
       149
       +
               });

     

       133
       150
        
               default = [];

     

       134
       151
        
               example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ];

     

       135
       152
        
               description = ''

     
···

       140
       157
        
                 NOTE: setting this option won't automatically enable given ports

     

       141
       158
        
                 in firewall configuration.

     

       142
       159
        
               '';

     

       143
       143
       -
               options = {

     

       144
       144
       -
                 addr = mkOption {

     

       145
       145
       -
                   type = types.nullOr types.str;

     

       146
       146
       -
                   default = null;

     

       147
       147
       -
                   description = ''

     

       148
       148
       -
                     Host, IPv4 or IPv6 address to listen to.

     

       149
       149
       -
                   '';

     

       150
       150
       -
                 };

     

       151
       151
       -
                 port = mkOption {

     

       152
       152
       -
                   type = types.nullOr types.int;

     

       153
       153
       -
                   default = null;

     

       154
       154
       -
                   description = ''

     

       155
       155
       -
                     Port to listen to.

     

       156
       156
       -
                   '';

     

       157
       157
       -
                 };

     

       158
       158
       -
               };

     

       159
       160
        
             };

     

       160
       161
        
       

     

       161
       162
        
             passwordAuthentication = mkOption {

+101 -102

nixos/modules/services/networking/supplicant.nix

···

       75
       75
        
         options = {

     

       76
       76
        
       

     

       77
       77
        
           networking.supplicant = mkOption {

     

       78
       78
       -
             type = types.attrsOf types.optionSet;

     

       78
       78
       +
             type = with types; attrsOf (submodule {

     

       79
       79
       +
               options = {

     

       80
       80
       +
         

     

       81
       81
       +
                 configFile = {

     

       82
       82
       +
         

     

       83
       83
       +
                   path = mkOption {

     

       84
       84
       +
                     type = types.path;

     

       85
       85
       +
                     example = literalExample "/etc/wpa_supplicant.conf";

     

       86
       86
       +
                     description = ''

     

       87
       87
       +
                       External <literal>wpa_supplicant.conf</literal> configuration file.

     

       88
       88
       +
                       The configuration options defined declaratively within <literal>networking.supplicant</literal> have

     

       89
       89
       +
                       precedence over options defined in <literal>configFile</literal>.

     

       90
       90
       +
                     '';

     

       91
       91
       +
                   };

     

       92
       92
       +
         

     

       93
       93
       +
                   writable = mkOption {

     

       94
       94
       +
                     type = types.bool;

     

       95
       95
       +
                     default = false;

     

       96
       96
       +
                     description = ''

     

       97
       97
       +
                       Whether the configuration file at <literal>configFile.path</literal> should be written to by

     

       98
       98
       +
                       <literal>wpa_supplicant</literal>.

     

       99
       99
       +
                     '';

     

       100
       100
       +
                   };

     

       101
       101
       +
         

     

       102
       102
       +
                 };

     

       103
       103
       +
         

     

       104
       104
       +
                 extraConf = mkOption {

     

       105
       105
       +
                   type = types.lines;

     

       106
       106
       +
                   default = "";

     

       107
       107
       +
                   example = ''

     

       108
       108
       +
                     ap_scan=1

     

       109
       109
       +
                     device_name=My-NixOS-Device

     

       110
       110
       +
                     device_type=1-0050F204-1

     

       111
       111
       +
                     driver_param=use_p2p_group_interface=1

     

       112
       112
       +
                     disable_scan_offload=1

     

       113
       113
       +
                     p2p_listen_reg_class=81

     

       114
       114
       +
                     p2p_listen_channel=1

     

       115
       115
       +
                     p2p_oper_reg_class=81

     

       116
       116
       +
                     p2p_oper_channel=1

     

       117
       117
       +
                     manufacturer=NixOS

     

       118
       118
       +
                     model_name=NixOS_Unstable

     

       119
       119
       +
                     model_number=2015

     

       120
       120
       +
                   '';

     

       121
       121
       +
                   description = ''

     

       122
       122
       +
                     Configuration options for <literal>wpa_supplicant.conf</literal>.

     

       123
       123
       +
                     Options defined here have precedence over options in <literal>configFile</literal>.

     

       124
       124
       +
                     NOTE: Do not write sensitive data into <literal>extraConf</literal> as it will

     

       125
       125
       +
                     be world-readable in the <literal>nix-store</literal>. For sensitive information

     

       126
       126
       +
                     use the <literal>configFile</literal> instead.

     

       127
       127
       +
                   '';

     

       128
       128
       +
                 };

     

       129
       129
       +
         

     

       130
       130
       +
                 extraCmdArgs = mkOption {

     

       131
       131
       +
                   type = types.str;

     

       132
       132
       +
                   default = "";

     

       133
       133
       +
                   example = "-e/var/run/wpa_supplicant/entropy.bin";

     

       134
       134
       +
                   description =

     

       135
       135
       +
                     "Command line arguments to add when executing <literal>wpa_supplicant</literal>.";

     

       136
       136
       +
                 };

     

       137
       137
       +
         

     

       138
       138
       +
                 driver = mkOption {

     

       139
       139
       +
                   type = types.nullOr types.str;

     

       140
       140
       +
                   default = "nl80211,wext";

     

       141
       141
       +
                   description = "Force a specific wpa_supplicant driver.";

     

       142
       142
       +
                 };

     

       143
       143
       +
         

     

       144
       144
       +
                 bridge = mkOption {

     

       145
       145
       +
                   type = types.str;

     

       146
       146
       +
                   default = "";

     

       147
       147
       +
                   description = "Name of the bridge interface that wpa_supplicant should listen at.";

     

       148
       148
       +
                 };

     

       149
       149
       +
         

     

       150
       150
       +
                 userControlled = {

     

       151
       151
       +
         

     

       152
       152
       +
                   enable = mkOption {

     

       153
       153
       +
                     type = types.bool;

     

       154
       154
       +
                     default = false;

     

       155
       155
       +
                     description = ''

     

       156
       156
       +
                       Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli.

     

       157
       157
       +
                       This is useful for laptop users that switch networks a lot and don't want

     

       158
       158
       +
                       to depend on a large package such as NetworkManager just to pick nearby

     

       159
       159
       +
                       access points.

     

       160
       160
       +
                     '';

     

       161
       161
       +
                   };

     

       162
       162
       +
         

     

       163
       163
       +
                   socketDir = mkOption {

     

       164
       164
       +
                     type = types.str;

     

       165
       165
       +
                     default = "/var/run/wpa_supplicant";

     

       166
       166
       +
                     description = "Directory of sockets for controlling wpa_supplicant.";

     

       167
       167
       +
                   };

     

       168
       168
       +
         

     

       169
       169
       +
                   group = mkOption {

     

       170
       170
       +
                     type = types.str;

     

       171
       171
       +
                     default = "wheel";

     

       172
       172
       +
                     example = "network";

     

       173
       173
       +
                     description = "Members of this group can control wpa_supplicant.";

     

       174
       174
       +
                   };

     

       175
       175
       +
         

     

       176
       176
       +
                 };

     

       177
       177
       +
               };

     

       178
       178
       +
             });

     

       79
       179
        
       

     

       80
       180
        
             default = { };

     

       81
       181
        
       

     
···

       108
       208
        
               <literal>DBUS</literal> defines a device-unrelated <command>wpa_supplicant</command>

     

       109
       209
        
               service that can be accessed through <literal>D-Bus</literal>.

     

       110
       210
        
             '';

     

       111
       111
       -
       

     

       112
       112
       -
             options = {

     

       113
       113
       -
       

     

       114
       114
       -
               configFile = {

     

       115
       115
       -
       

     

       116
       116
       -
                 path = mkOption {

     

       117
       117
       -
                   type = types.path;

     

       118
       118
       -
                   example = literalExample "/etc/wpa_supplicant.conf";

     

       119
       119
       -
                   description = ''

     

       120
       120
       -
                     External <literal>wpa_supplicant.conf</literal> configuration file.

     

       121
       121
       -
                     The configuration options defined declaratively within <literal>networking.supplicant</literal> have

     

       122
       122
       -
                     precedence over options defined in <literal>configFile</literal>.

     

       123
       123
       -
                   '';

     

       124
       124
       -
                 };

     

       125
       125
       -
       

     

       126
       126
       -
                 writable = mkOption {

     

       127
       127
       -
                   type = types.bool;

     

       128
       128
       -
                   default = false;

     

       129
       129
       -
                   description = ''

     

       130
       130
       -
                     Whether the configuration file at <literal>configFile.path</literal> should be written to by

     

       131
       131
       -
                     <literal>wpa_supplicant</literal>.

     

       132
       132
       -
                   '';

     

       133
       133
       -
                 };

     

       134
       134
       -
       

     

       135
       135
       -
               };

     

       136
       136
       -
       

     

       137
       137
       -
               extraConf = mkOption {

     

       138
       138
       -
                 type = types.lines;

     

       139
       139
       -
                 default = "";

     

       140
       140
       -
                 example = ''

     

       141
       141
       -
                   ap_scan=1

     

       142
       142
       -
                   device_name=My-NixOS-Device

     

       143
       143
       -
                   device_type=1-0050F204-1

     

       144
       144
       -
                   driver_param=use_p2p_group_interface=1

     

       145
       145
       -
                   disable_scan_offload=1

     

       146
       146
       -
                   p2p_listen_reg_class=81

     

       147
       147
       -
                   p2p_listen_channel=1

     

       148
       148
       -
                   p2p_oper_reg_class=81

     

       149
       149
       -
                   p2p_oper_channel=1

     

       150
       150
       -
                   manufacturer=NixOS

     

       151
       151
       -
                   model_name=NixOS_Unstable

     

       152
       152
       -
                   model_number=2015

     

       153
       153
       -
                 '';

     

       154
       154
       -
                 description = ''

     

       155
       155
       -
                   Configuration options for <literal>wpa_supplicant.conf</literal>.

     

       156
       156
       -
                   Options defined here have precedence over options in <literal>configFile</literal>.

     

       157
       157
       -
                   NOTE: Do not write sensitive data into <literal>extraConf</literal> as it will

     

       158
       158
       -
                   be world-readable in the <literal>nix-store</literal>. For sensitive information

     

       159
       159
       -
                   use the <literal>configFile</literal> instead.

     

       160
       160
       -
                 '';

     

       161
       161
       -
               };

     

       162
       162
       -
       

     

       163
       163
       -
               extraCmdArgs = mkOption {

     

       164
       164
       -
                 type = types.str;

     

       165
       165
       -
                 default = "";

     

       166
       166
       -
                 example = "-e/var/run/wpa_supplicant/entropy.bin";

     

       167
       167
       -
                 description =

     

       168
       168
       -
                   "Command line arguments to add when executing <literal>wpa_supplicant</literal>.";

     

       169
       169
       -
               };

     

       170
       170
       -
       

     

       171
       171
       -
               driver = mkOption {

     

       172
       172
       -
                 type = types.nullOr types.str;

     

       173
       173
       -
                 default = "nl80211,wext";

     

       174
       174
       -
                 description = "Force a specific wpa_supplicant driver.";

     

       175
       175
       -
               };

     

       176
       176
       -
       

     

       177
       177
       -
               bridge = mkOption {

     

       178
       178
       -
                 type = types.str;

     

       179
       179
       -
                 default = "";

     

       180
       180
       -
                 description = "Name of the bridge interface that wpa_supplicant should listen at.";

     

       181
       181
       -
               };

     

       182
       182
       -
       

     

       183
       183
       -
               userControlled = {

     

       184
       184
       -
       

     

       185
       185
       -
                 enable = mkOption {

     

       186
       186
       -
                   type = types.bool;

     

       187
       187
       -
                   default = false;

     

       188
       188
       -
                   description = ''

     

       189
       189
       -
                     Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli.

     

       190
       190
       -
                     This is useful for laptop users that switch networks a lot and don't want

     

       191
       191
       -
                     to depend on a large package such as NetworkManager just to pick nearby

     

       192
       192
       -
                     access points.

     

       193
       193
       -
                   '';

     

       194
       194
       -
                 };

     

       195
       195
       -
       

     

       196
       196
       -
                 socketDir = mkOption {

     

       197
       197
       -
                   type = types.str;

     

       198
       198
       -
                   default = "/var/run/wpa_supplicant";

     

       199
       199
       -
                   description = "Directory of sockets for controlling wpa_supplicant.";

     

       200
       200
       -
                 };

     

       201
       201
       -
       

     

       202
       202
       -
                 group = mkOption {

     

       203
       203
       -
                   type = types.str;

     

       204
       204
       -
                   default = "wheel";

     

       205
       205
       -
                   example = "network";

     

       206
       206
       -
                   description = "Members of this group can control wpa_supplicant.";

     

       207
       207
       -
                 };

     

       208
       208
       -
       

     

       209
       209
       -
               };

     

       210
       210
       -
       

     

       211
       211
       -
             };

     

       212
       211
        
       

     

       213
       212
        
           };

     

       214
       213

+79 -77

nixos/modules/services/networking/tinc.nix

···

       18
       18
        
       

     

       19
       19
        
             networks = mkOption {

     

       20
       20
        
               default = { };

     

       21
       21
       -
               type = types.loaOf types.optionSet;

     

       22
       22
       -
               description = ''

     

       23
       23
       -
                 Defines the tinc networks which will be started.

     

       24
       24
       -
                 Each network invokes a different daemon.

     

       25
       25
       -
               '';

     

       26
       26
       -
               options = {

     

       21
       21
       +
               type = with types; loaOf (submodule {

     

       22
       22
       +
                 options = {

     

       27
       23
        
       

     

       28
       28
       -
                 extraConfig = mkOption {

     

       29
       29
       -
                   default = "";

     

       30
       30
       -
                   type = types.lines;

     

       31
       31
       -
                   description = ''

     

       32
       32
       -
                     Extra lines to add to the tinc service configuration file.

     

       33
       33
       -
                   '';

     

       34
       34
       -
                 };

     

       24
       24
       +
                   extraConfig = mkOption {

     

       25
       25
       +
                     default = "";

     

       26
       26
       +
                     type = types.lines;

     

       27
       27
       +
                     description = ''

     

       28
       28
       +
                       Extra lines to add to the tinc service configuration file.

     

       29
       29
       +
                     '';

     

       30
       30
       +
                   };

     

       35
       31
        
       

     

       36
       36
       -
                 name = mkOption {

     

       37
       37
       -
                   default = null;

     

       38
       38
       -
                   type = types.nullOr types.str;

     

       39
       39
       -
                   description = ''

     

       40
       40
       -
                     The name of the node which is used as an identifier when communicating

     

       41
       41
       -
                     with the remote nodes in the mesh. If null then the hostname of the system

     

       42
       42
       -
                     is used.

     

       43
       43
       -
                   '';

     

       44
       44
       -
                 };

     

       32
       32
       +
                   name = mkOption {

     

       33
       33
       +
                     default = null;

     

       34
       34
       +
                     type = types.nullOr types.str;

     

       35
       35
       +
                     description = ''

     

       36
       36
       +
                       The name of the node which is used as an identifier when communicating

     

       37
       37
       +
                       with the remote nodes in the mesh. If null then the hostname of the system

     

       38
       38
       +
                       is used.

     

       39
       39
       +
                     '';

     

       40
       40
       +
                   };

     

       45
       41
        
       

     

       46
       46
       -
                 ed25519PrivateKeyFile = mkOption {

     

       47
       47
       -
                   default = null;

     

       48
       48
       -
                   type = types.nullOr types.path;

     

       49
       49
       -
                   description = ''

     

       50
       50
       -
                     Path of the private ed25519 keyfile.

     

       51
       51
       -
                   '';

     

       52
       52
       -
                 };

     

       42
       42
       +
                   ed25519PrivateKeyFile = mkOption {

     

       43
       43
       +
                     default = null;

     

       44
       44
       +
                     type = types.nullOr types.path;

     

       45
       45
       +
                     description = ''

     

       46
       46
       +
                       Path of the private ed25519 keyfile.

     

       47
       47
       +
                     '';

     

       48
       48
       +
                   };

     

       53
       49
        
       

     

       54
       54
       -
                 debugLevel = mkOption {

     

       55
       55
       -
                   default = 0;

     

       56
       56
       -
                   type = types.addCheck types.int (l: l >= 0 && l <= 5);

     

       57
       57
       -
                   description = ''

     

       58
       58
       -
                     The amount of debugging information to add to the log. 0 means little

     

       59
       59
       -
                     logging while 5 is the most logging. <command>man tincd</command> for

     

       60
       60
       -
                     more details.

     

       61
       61
       -
                   '';

     

       62
       62
       -
                 };

     

       50
       50
       +
                   debugLevel = mkOption {

     

       51
       51
       +
                     default = 0;

     

       52
       52
       +
                     type = types.addCheck types.int (l: l >= 0 && l <= 5);

     

       53
       53
       +
                     description = ''

     

       54
       54
       +
                       The amount of debugging information to add to the log. 0 means little

     

       55
       55
       +
                       logging while 5 is the most logging. <command>man tincd</command> for

     

       56
       56
       +
                       more details.

     

       57
       57
       +
                     '';

     

       58
       58
       +
                   };

     

       63
       59
        
       

     

       64
       64
       -
                 hosts = mkOption {

     

       65
       65
       -
                   default = { };

     

       66
       66
       -
                   type = types.loaOf types.lines;

     

       67
       67
       -
                   description = ''

     

       68
       68
       -
                     The name of the host in the network as well as the configuration for that host.

     

       69
       69
       -
                     This name should only contain alphanumerics and underscores.

     

       70
       70
       -
                   '';

     

       71
       71
       -
                 };

     

       60
       60
       +
                   hosts = mkOption {

     

       61
       61
       +
                     default = { };

     

       62
       62
       +
                     type = types.loaOf types.lines;

     

       63
       63
       +
                     description = ''

     

       64
       64
       +
                       The name of the host in the network as well as the configuration for that host.

     

       65
       65
       +
                       This name should only contain alphanumerics and underscores.

     

       66
       66
       +
                     '';

     

       67
       67
       +
                   };

     

       72
       68
        
       

     

       73
       73
       -
                 interfaceType = mkOption {

     

       74
       74
       -
                   default = "tun";

     

       75
       75
       -
                   type = types.addCheck types.str (n: n == "tun" || n == "tap");

     

       76
       76
       -
                   description = ''

     

       77
       77
       -
                     The type of virtual interface used for the network connection

     

       78
       78
       -
                   '';

     

       79
       79
       -
                 };

     

       69
       69
       +
                   interfaceType = mkOption {

     

       70
       70
       +
                     default = "tun";

     

       71
       71
       +
                     type = types.addCheck types.str (n: n == "tun" || n == "tap");

     

       72
       72
       +
                     description = ''

     

       73
       73
       +
                       The type of virtual interface used for the network connection

     

       74
       74
       +
                     '';

     

       75
       75
       +
                   };

     

       80
       76
        
       

     

       81
       81
       -
                 listenAddress = mkOption {

     

       82
       82
       -
                   default = null;

     

       83
       83
       -
                   type = types.nullOr types.str;

     

       84
       84
       -
                   description = ''

     

       85
       85
       -
                     The ip adress to bind to.

     

       86
       86
       -
                   '';

     

       87
       87
       -
                 };

     

       77
       77
       +
                   listenAddress = mkOption {

     

       78
       78
       +
                     default = null;

     

       79
       79
       +
                     type = types.nullOr types.str;

     

       80
       80
       +
                     description = ''

     

       81
       81
       +
                       The ip adress to bind to.

     

       82
       82
       +
                     '';

     

       83
       83
       +
                   };

     

       88
       84
        
       

     

       89
       89
       -
                 package = mkOption {

     

       90
       90
       -
                   type = types.package;

     

       91
       91
       -
                   default = pkgs.tinc_pre;

     

       92
       92
       -
                   defaultText = "pkgs.tinc_pre";

     

       93
       93
       -
                   description = ''

     

       94
       94
       -
                     The package to use for the tinc daemon's binary.

     

       95
       95
       -
                   '';

     

       96
       96
       -
                 };

     

       85
       85
       +
                   package = mkOption {

     

       86
       86
       +
                     type = types.package;

     

       87
       87
       +
                     default = pkgs.tinc_pre;

     

       88
       88
       +
                     defaultText = "pkgs.tinc_pre";

     

       89
       89
       +
                     description = ''

     

       90
       90
       +
                       The package to use for the tinc daemon's binary.

     

       91
       91
       +
                     '';

     

       92
       92
       +
                   };

     

       97
       93
        
       

     

       98
       98
       -
                 chroot = mkOption {

     

       99
       99
       -
                   default = true;

     

       100
       100
       -
                   type = types.bool;

     

       101
       101
       -
                   description = ''

     

       102
       102
       -
                     Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security.

     

       103
       103
       -
                     The chroot is performed after all the initialization is done, after writing pid files and opening network sockets.

     

       94
       94
       +
                   chroot = mkOption {

     

       95
       95
       +
                     default = true;

     

       96
       96
       +
                     type = types.bool;

     

       97
       97
       +
                     description = ''

     

       98
       98
       +
                       Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security.

     

       99
       99
       +
                       The chroot is performed after all the initialization is done, after writing pid files and opening network sockets.

     

       104
       100
        
       

     

       105
       105
       -
                     Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment.

     

       106
       106
       -
                   '';

     

       101
       101
       +
                       Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment.

     

       102
       102
       +
                     '';

     

       103
       103
       +
                   };

     

       107
       104
        
                 };

     

       108
       108
       -
               };

     

       105
       105
       +
               });

     

       106
       106
       +
       

     

       107
       107
       +
               description = ''

     

       108
       108
       +
                 Defines the tinc networks which will be started.

     

       109
       109
       +
                 Each network invokes a different daemon.

     

       110
       110
       +
               '';

     

       109
       111
        
             };

     

       110
       112
        
           };

     

       111
       113

+55 -53

nixos/modules/services/networking/xinetd.nix

···

       65
       65
        
               A list of services provided by xinetd.

     

       66
       66
        
             '';

     

       67
       67
        
       

     

       68
       68
       -
             type = types.listOf types.optionSet;

     

       68
       68
       +
             type = with types; listOf (submodule ({

     

       69
       69
        
       

     

       70
       70
       -
             options = {

     

       70
       70
       +
               options = {

     

       71
       71
        
       

     

       72
       72
       -
               name = mkOption {

     

       73
       73
       -
                 type = types.string;

     

       74
       74
       -
                 example = "login";

     

       75
       75
       -
                 description = "Name of the service.";

     

       76
       76
       -
               };

     

       72
       72
       +
                 name = mkOption {

     

       73
       73
       +
                   type = types.string;

     

       74
       74
       +
                   example = "login";

     

       75
       75
       +
                   description = "Name of the service.";

     

       76
       76
       +
                 };

     

       77
       77
        
       

     

       78
       78
       -
               protocol = mkOption {

     

       79
       79
       -
                 type = types.string;

     

       80
       80
       -
                 default = "tcp";

     

       81
       81
       -
                 description =

     

       82
       82
       -
                   "Protocol of the service.  Usually <literal>tcp</literal> or <literal>udp</literal>.";

     

       83
       83
       -
               };

     

       78
       78
       +
                 protocol = mkOption {

     

       79
       79
       +
                   type = types.string;

     

       80
       80
       +
                   default = "tcp";

     

       81
       81
       +
                   description =

     

       82
       82
       +
                     "Protocol of the service.  Usually <literal>tcp</literal> or <literal>udp</literal>.";

     

       83
       83
       +
                 };

     

       84
       84
        
       

     

       85
       85
       -
               port = mkOption {

     

       86
       86
       -
                 type = types.int;

     

       87
       87
       -
                 default = 0;

     

       88
       88
       -
                 example = 123;

     

       89
       89
       -
                 description = "Port number of the service.";

     

       90
       90
       -
               };

     

       85
       85
       +
                 port = mkOption {

     

       86
       86
       +
                   type = types.int;

     

       87
       87
       +
                   default = 0;

     

       88
       88
       +
                   example = 123;

     

       89
       89
       +
                   description = "Port number of the service.";

     

       90
       90
       +
                 };

     

       91
       91
        
       

     

       92
       92
       -
               user = mkOption {

     

       93
       93
       -
                 type = types.string;

     

       94
       94
       -
                 default = "nobody";

     

       95
       95
       -
                 description = "User account for the service";

     

       96
       96
       -
               };

     

       92
       92
       +
                 user = mkOption {

     

       93
       93
       +
                   type = types.string;

     

       94
       94
       +
                   default = "nobody";

     

       95
       95
       +
                   description = "User account for the service";

     

       96
       96
       +
                 };

     

       97
       97
        
       

     

       98
       98
       -
               server = mkOption {

     

       99
       99
       -
                 type = types.string;

     

       100
       100
       -
                 example = "/foo/bin/ftpd";

     

       101
       101
       -
                 description = "Path of the program that implements the service.";

     

       102
       102
       -
               };

     

       98
       98
       +
                 server = mkOption {

     

       99
       99
       +
                   type = types.string;

     

       100
       100
       +
                   example = "/foo/bin/ftpd";

     

       101
       101
       +
                   description = "Path of the program that implements the service.";

     

       102
       102
       +
                 };

     

       103
       103
        
       

     

       104
       104
       -
               serverArgs = mkOption {

     

       105
       105
       -
                 type = types.string;

     

       106
       106
       -
                 default = "";

     

       107
       107
       -
                 description = "Command-line arguments for the server program.";

     

       108
       108
       -
               };

     

       104
       104
       +
                 serverArgs = mkOption {

     

       105
       105
       +
                   type = types.string;

     

       106
       106
       +
                   default = "";

     

       107
       107
       +
                   description = "Command-line arguments for the server program.";

     

       108
       108
       +
                 };

     

       109
       109
        
       

     

       110
       110
       -
               flags = mkOption {

     

       111
       111
       -
                 type = types.string;

     

       112
       112
       -
                 default = "";

     

       113
       113
       -
                 description = "";

     

       114
       114
       -
               };

     

       110
       110
       +
                 flags = mkOption {

     

       111
       111
       +
                   type = types.string;

     

       112
       112
       +
                   default = "";

     

       113
       113
       +
                   description = "";

     

       114
       114
       +
                 };

     

       115
       115
        
       

     

       116
       116
       -
               unlisted = mkOption {

     

       117
       117
       -
                 type = types.bool;

     

       118
       118
       -
                 default = false;

     

       119
       119
       -
                 description = ''

     

       120
       120
       -
                   Whether this server is listed in

     

       121
       121
       -
                   <filename>/etc/services</filename>.  If so, the port

     

       122
       122
       -
                   number can be omitted.

     

       123
       123
       -
                 '';

     

       124
       124
       -
               };

     

       116
       116
       +
                 unlisted = mkOption {

     

       117
       117
       +
                   type = types.bool;

     

       118
       118
       +
                   default = false;

     

       119
       119
       +
                   description = ''

     

       120
       120
       +
                     Whether this server is listed in

     

       121
       121
       +
                     <filename>/etc/services</filename>.  If so, the port

     

       122
       122
       +
                     number can be omitted.

     

       123
       123
       +
                   '';

     

       124
       124
       +
                 };

     

       125
       125
       +
       

     

       126
       126
       +
                 extraConfig = mkOption {

     

       127
       127
       +
                   type = types.string;

     

       128
       128
       +
                   default = "";

     

       129
       129
       +
                   description = "Extra configuration-lines added to the section of the service.";

     

       130
       130
       +
                 };

     

       125
       131
        
       

     

       126
       126
       -
               extraConfig = mkOption {

     

       127
       127
       -
                 type = types.string;

     

       128
       128
       -
                 default = "";

     

       129
       129
       -
                 description = "Extra configuration-lines added to the section of the service.";

     

       130
       132
        
               };

     

       131
       133
        
       

     

       132
       132
       -
             };

     

       134
       134
       +
             }));

     

       133
       135
        
       

     

       134
       136
        
           };

     

       135
       137

+1 -2

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

···

       113
       113
        
         options = {

     

       114
       114
        
           services.winstone = mkOption {

     

       115
       115
        
             default = {};

     

       116
       116
       -
             type = types.attrsOf types.optionSet;

     

       117
       117
       -
             options = [ winstoneOpts ];

     

       116
       116
       +
             type = with types; attrsOf (submodule winstoneOpts);

     

       118
       117
        
             description = ''

     

       119
       118
        
               Defines independent Winstone services, each serving one WAR-file.

     

       120
       119
        
             '';

+1 -2

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

···

       74
       74
        
       

     

       75
       75
        
           services.zope2.instances = mkOption {

     

       76
       76
        
             default = {};

     

       77
       77
       -
             type = types.loaOf types.optionSet;

     

       77
       77
       +
             type = with types; loaOf (submodule zope2Opts);

     

       78
       78
        
             example = literalExample ''

     

       79
       79
        
               {

     

       80
       80
        
                 plone01 = {

     
···

       96
       96
        
               }

     

       97
       97
        
             '';

     

       98
       98
        
             description = "zope2 instances to be created automaticaly by the system.";

     

       99
       99
       -
             options = [ zope2Opts ];

     

       100
       99
        
           };

     

       101
       100
        
         };

     

       102
       101

+39 -39

nixos/modules/system/boot/loader/grub/grub.nix

···

       131
       131
        
                 to the respective devices corresponding to those partitions.

     

       132
       132
        
               '';

     

       133
       133
        
       

     

       134
       134
       -
               type = types.listOf types.optionSet;

     

       134
       134
       +
               type = with types; listOf (submodule {

     

       135
       135
       +
                 options = {

     

       135
       136
        
       

     

       136
       136
       -
               options = {

     

       137
       137
       +
                   path = mkOption {

     

       138
       138
       +
                     example = "/boot1";

     

       139
       139
       +
                     type = types.str;

     

       140
       140
       +
                     description = ''

     

       141
       141
       +
                       The path to the boot directory where GRUB will be written. Generally

     

       142
       142
       +
                       this boot path should double as an EFI path.

     

       143
       143
       +
                     '';

     

       144
       144
       +
                   };

     

       137
       145
        
       

     

       138
       138
       -
                 path = mkOption {

     

       139
       139
       -
                   example = "/boot1";

     

       140
       140
       -
                   type = types.str;

     

       141
       141
       -
                   description = ''

     

       142
       142
       -
                     The path to the boot directory where GRUB will be written. Generally

     

       143
       143
       -
                     this boot path should double as an EFI path.

     

       144
       144
       -
                   '';

     

       145
       145
       -
                 };

     

       146
       146
       +
                   efiSysMountPoint = mkOption {

     

       147
       147
       +
                     default = null;

     

       148
       148
       +
                     example = "/boot1/efi";

     

       149
       149
       +
                     type = types.nullOr types.str;

     

       150
       150
       +
                     description = ''

     

       151
       151
       +
                       The path to the efi system mount point. Usually this is the same

     

       152
       152
       +
                       partition as the above path and can be left as null.

     

       153
       153
       +
                     '';

     

       154
       154
       +
                   };

     

       146
       155
        
       

     

       147
       147
       -
                 efiSysMountPoint = mkOption {

     

       148
       148
       -
                   default = null;

     

       149
       149
       -
                   example = "/boot1/efi";

     

       150
       150
       -
                   type = types.nullOr types.str;

     

       151
       151
       -
                   description = ''

     

       152
       152
       -
                     The path to the efi system mount point. Usually this is the same

     

       153
       153
       -
                     partition as the above path and can be left as null.

     

       154
       154
       -
                   '';

     

       155
       155
       -
                 };

     

       156
       156
       +
                   efiBootloaderId = mkOption {

     

       157
       157
       +
                     default = null;

     

       158
       158
       +
                     example = "NixOS-fsid";

     

       159
       159
       +
                     type = types.nullOr types.str;

     

       160
       160
       +
                     description = ''

     

       161
       161
       +
                       The id of the bootloader to store in efi nvram.

     

       162
       162
       +
                       The default is to name it NixOS and append the path or efiSysMountPoint.

     

       163
       163
       +
                       This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true.

     

       164
       164
       +
                     '';

     

       165
       165
       +
                   };

     

       156
       166
        
       

     

       157
       157
       -
                 efiBootloaderId = mkOption {

     

       158
       158
       -
                   default = null;

     

       159
       159
       -
                   example = "NixOS-fsid";

     

       160
       160
       -
                   type = types.nullOr types.str;

     

       161
       161
       -
                   description = ''

     

       162
       162
       -
                     The id of the bootloader to store in efi nvram.

     

       163
       163
       -
                     The default is to name it NixOS and append the path or efiSysMountPoint.

     

       164
       164
       -
                     This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true.

     

       165
       165
       -
                   '';

     

       166
       166
       -
                 };

     

       167
       167
       +
                   devices = mkOption {

     

       168
       168
       +
                     default = [ ];

     

       169
       169
       +
                     example = [ "/dev/sda" "/dev/sdb" ];

     

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

     

       171
       171
       +
                     description = ''

     

       172
       172
       +
                       The path to the devices which will have the GRUB MBR written.

     

       173
       173
       +
                       Note these are typically device paths and not paths to partitions.

     

       174
       174
       +
                     '';

     

       175
       175
       +
                   };

     

       167
       176
        
       

     

       168
       168
       -
                 devices = mkOption {

     

       169
       169
       -
                   default = [ ];

     

       170
       170
       -
                   example = [ "/dev/sda" "/dev/sdb" ];

     

       171
       171
       -
                   type = types.listOf types.str;

     

       172
       172
       -
                   description = ''

     

       173
       173
       -
                     The path to the devices which will have the GRUB MBR written.

     

       174
       174
       -
                     Note these are typically device paths and not paths to partitions.

     

       175
       175
       -
                   '';

     

       176
       177
        
                 };

     

       177
       177
       -
       

     

       178
       178
       -
               };

     

       178
       178
       +
               });

     

       179
       179
        
             };

     

       180
       180
        
       

     

       181
       181
        
             configurationName = mkOption {

+136 -136

nixos/modules/system/boot/luksroot.nix

···

       236
       236
        
               <filename>/dev/mapper/<replaceable>name</replaceable></filename>.

     

       237
       237
        
             '';

     

       238
       238
        
       

     

       239
       239
       -
             type = types.loaOf types.optionSet;

     

       239
       239
       +
             type = with types; loaOf (submodule (

     

       240
       240
       +
               { name, ... }: { options = {

     

       240
       241
        
       

     

       241
       241
       -
             options = { name, ... }: { options = {

     

       242
       242
       -
       

     

       243
       243
       -
               name = mkOption {

     

       244
       244
       -
                 visible = false;

     

       245
       245
       -
                 default = name;

     

       246
       246
       -
                 example = "luksroot";

     

       247
       247
       -
                 type = types.str;

     

       248
       248
       -
                 description = "Name of the unencrypted device in <filename>/dev/mapper</filename>.";

     

       249
       249
       -
               };

     

       242
       242
       +
                 name = mkOption {

     

       243
       243
       +
                   visible = false;

     

       244
       244
       +
                   default = name;

     

       245
       245
       +
                   example = "luksroot";

     

       246
       246
       +
                   type = types.str;

     

       247
       247
       +
                   description = "Name of the unencrypted device in <filename>/dev/mapper</filename>.";

     

       248
       248
       +
                 };

     

       250
       249
        
       

     

       251
       251
       -
               device = mkOption {

     

       252
       252
       -
                 example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08";

     

       253
       253
       -
                 type = types.str;

     

       254
       254
       -
                 description = "Path of the underlying encrypted block device.";

     

       255
       255
       -
               };

     

       250
       250
       +
                 device = mkOption {

     

       251
       251
       +
                   example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08";

     

       252
       252
       +
                   type = types.str;

     

       253
       253
       +
                   description = "Path of the underlying encrypted block device.";

     

       254
       254
       +
                 };

     

       256
       255
        
       

     

       257
       257
       -
               header = mkOption {

     

       258
       258
       -
                 default = null;

     

       259
       259
       -
                 example = "/root/header.img";

     

       260
       260
       -
                 type = types.nullOr types.str;

     

       261
       261
       -
                 description = ''

     

       262
       262
       -
                   The name of the file or block device that

     

       263
       263
       -
                   should be used as header for the encrypted device.

     

       264
       264
       -
                 '';

     

       265
       265
       -
               };

     

       256
       256
       +
                 header = mkOption {

     

       257
       257
       +
                   default = null;

     

       258
       258
       +
                   example = "/root/header.img";

     

       259
       259
       +
                   type = types.nullOr types.str;

     

       260
       260
       +
                   description = ''

     

       261
       261
       +
                     The name of the file or block device that

     

       262
       262
       +
                     should be used as header for the encrypted device.

     

       263
       263
       +
                   '';

     

       264
       264
       +
                 };

     

       266
       265
        
       

     

       267
       267
       -
               keyFile = mkOption {

     

       268
       268
       -
                 default = null;

     

       269
       269
       -
                 example = "/dev/sdb1";

     

       270
       270
       -
                 type = types.nullOr types.str;

     

       271
       271
       -
                 description = ''

     

       272
       272
       -
                   The name of the file (can be a raw device or a partition) that

     

       273
       273
       -
                   should be used as the decryption key for the encrypted device. If

     

       274
       274
       -
                   not specified, you will be prompted for a passphrase instead.

     

       275
       275
       -
                 '';

     

       276
       276
       -
               };

     

       266
       266
       +
                 keyFile = mkOption {

     

       267
       267
       +
                   default = null;

     

       268
       268
       +
                   example = "/dev/sdb1";

     

       269
       269
       +
                   type = types.nullOr types.str;

     

       270
       270
       +
                   description = ''

     

       271
       271
       +
                     The name of the file (can be a raw device or a partition) that

     

       272
       272
       +
                     should be used as the decryption key for the encrypted device. If

     

       273
       273
       +
                     not specified, you will be prompted for a passphrase instead.

     

       274
       274
       +
                   '';

     

       275
       275
       +
                 };

     

       277
       276
        
       

     

       278
       278
       -
               keyFileSize = mkOption {

     

       279
       279
       -
                 default = null;

     

       280
       280
       -
                 example = 4096;

     

       281
       281
       -
                 type = types.nullOr types.int;

     

       282
       282
       -
                 description = ''

     

       283
       283
       -
                   The size of the key file. Use this if only the beginning of the

     

       284
       284
       -
                   key file should be used as a key (often the case if a raw device

     

       285
       285
       -
                   or partition is used as key file). If not specified, the whole

     

       286
       286
       -
                   <literal>keyFile</literal> will be used decryption, instead of just

     

       287
       287
       -
                   the first <literal>keyFileSize</literal> bytes.

     

       288
       288
       -
                 '';

     

       289
       289
       -
               };

     

       277
       277
       +
                 keyFileSize = mkOption {

     

       278
       278
       +
                   default = null;

     

       279
       279
       +
                   example = 4096;

     

       280
       280
       +
                   type = types.nullOr types.int;

     

       281
       281
       +
                   description = ''

     

       282
       282
       +
                     The size of the key file. Use this if only the beginning of the

     

       283
       283
       +
                     key file should be used as a key (often the case if a raw device

     

       284
       284
       +
                     or partition is used as key file). If not specified, the whole

     

       285
       285
       +
                     <literal>keyFile</literal> will be used decryption, instead of just

     

       286
       286
       +
                     the first <literal>keyFileSize</literal> bytes.

     

       287
       287
       +
                   '';

     

       288
       288
       +
                 };

     

       290
       289
        
       

     

       291
       291
       -
               # FIXME: get rid of this option.

     

       292
       292
       -
               preLVM = mkOption {

     

       293
       293
       -
                 default = true;

     

       294
       294
       -
                 type = types.bool;

     

       295
       295
       -
                 description = "Whether the luksOpen will be attempted before LVM scan or after it.";

     

       296
       296
       -
               };

     

       290
       290
       +
                 # FIXME: get rid of this option.

     

       291
       291
       +
                 preLVM = mkOption {

     

       292
       292
       +
                   default = true;

     

       293
       293
       +
                   type = types.bool;

     

       294
       294
       +
                   description = "Whether the luksOpen will be attempted before LVM scan or after it.";

     

       295
       295
       +
                 };

     

       297
       296
        
       

     

       298
       298
       -
               allowDiscards = mkOption {

     

       299
       299
       -
                 default = false;

     

       300
       300
       -
                 type = types.bool;

     

       301
       301
       -
                 description = ''

     

       302
       302
       -
                   Whether to allow TRIM requests to the underlying device. This option

     

       303
       303
       -
                   has security implications; please read the LUKS documentation before

     

       304
       304
       -
                   activating it.

     

       305
       305
       -
                 '';

     

       306
       306
       -
               };

     

       297
       297
       +
                 allowDiscards = mkOption {

     

       298
       298
       +
                   default = false;

     

       299
       299
       +
                   type = types.bool;

     

       300
       300
       +
                   description = ''

     

       301
       301
       +
                     Whether to allow TRIM requests to the underlying device. This option

     

       302
       302
       +
                     has security implications; please read the LUKS documentation before

     

       303
       303
       +
                     activating it.

     

       304
       304
       +
                   '';

     

       305
       305
       +
                 };

     

       307
       306
        
       

     

       308
       308
       -
               yubikey = mkOption {

     

       309
       309
       -
                 default = null;

     

       310
       310
       -
                 type = types.nullOr types.optionSet;

     

       311
       311
       -
                 description = ''

     

       312
       312
       -
                   The options to use for this LUKS device in Yubikey-PBA.

     

       313
       313
       -
                   If null (the default), Yubikey-PBA will be disabled for this device.

     

       314
       314
       -
                 '';

     

       307
       307
       +
                 yubikey = mkOption {

     

       308
       308
       +
                   default = null;

     

       309
       309
       +
                   description = ''

     

       310
       310
       +
                     The options to use for this LUKS device in Yubikey-PBA.

     

       311
       311
       +
                     If null (the default), Yubikey-PBA will be disabled for this device.

     

       312
       312
       +
                   '';

     

       315
       313
        
       

     

       316
       316
       -
                 options = {

     

       317
       317
       -
                   twoFactor = mkOption {

     

       318
       318
       -
                     default = true;

     

       319
       319
       -
                     type = types.bool;

     

       320
       320
       -
                     description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";

     

       321
       321
       -
                   };

     

       314
       314
       +
                   type = with types; nullOr (submodule {

     

       315
       315
       +
                     options = {

     

       316
       316
       +
                       twoFactor = mkOption {

     

       317
       317
       +
                         default = true;

     

       318
       318
       +
                         type = types.bool;

     

       319
       319
       +
                         description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";

     

       320
       320
       +
                       };

     

       322
       321
        
       

     

       323
       323
       -
                   slot = mkOption {

     

       324
       324
       -
                     default = 2;

     

       325
       325
       -
                     type = types.int;

     

       326
       326
       -
                     description = "Which slot on the Yubikey to challenge.";

     

       327
       327
       -
                   };

     

       322
       322
       +
                       slot = mkOption {

     

       323
       323
       +
                         default = 2;

     

       324
       324
       +
                         type = types.int;

     

       325
       325
       +
                         description = "Which slot on the Yubikey to challenge.";

     

       326
       326
       +
                       };

     

       328
       327
        
       

     

       329
       329
       -
                   saltLength = mkOption {

     

       330
       330
       -
                     default = 16;

     

       331
       331
       -
                     type = types.int;

     

       332
       332
       -
                     description = "Length of the new salt in byte (64 is the effective maximum).";

     

       333
       333
       -
                   };

     

       328
       328
       +
                       saltLength = mkOption {

     

       329
       329
       +
                         default = 16;

     

       330
       330
       +
                         type = types.int;

     

       331
       331
       +
                         description = "Length of the new salt in byte (64 is the effective maximum).";

     

       332
       332
       +
                       };

     

       334
       333
        
       

     

       335
       335
       -
                   keyLength = mkOption {

     

       336
       336
       -
                     default = 64;

     

       337
       337
       -
                     type = types.int;

     

       338
       338
       -
                     description = "Length of the LUKS slot key derived with PBKDF2 in byte.";

     

       339
       339
       -
                   };

     

       334
       334
       +
                       keyLength = mkOption {

     

       335
       335
       +
                         default = 64;

     

       336
       336
       +
                         type = types.int;

     

       337
       337
       +
                         description = "Length of the LUKS slot key derived with PBKDF2 in byte.";

     

       338
       338
       +
                       };

     

       340
       339
        
       

     

       341
       341
       -
                   iterationStep = mkOption {

     

       342
       342
       -
                     default = 0;

     

       343
       343
       -
                     type = types.int;

     

       344
       344
       -
                     description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";

     

       345
       345
       -
                   };

     

       340
       340
       +
                       iterationStep = mkOption {

     

       341
       341
       +
                         default = 0;

     

       342
       342
       +
                         type = types.int;

     

       343
       343
       +
                         description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";

     

       344
       344
       +
                       };

     

       346
       345
        
       

     

       347
       347
       -
                   gracePeriod = mkOption {

     

       348
       348
       -
                     default = 2;

     

       349
       349
       -
                     type = types.int;

     

       350
       350
       -
                     description = "Time in seconds to wait before attempting to find the Yubikey.";

     

       351
       351
       -
                   };

     

       346
       346
       +
                       gracePeriod = mkOption {

     

       347
       347
       +
                         default = 2;

     

       348
       348
       +
                         type = types.int;

     

       349
       349
       +
                         description = "Time in seconds to wait before attempting to find the Yubikey.";

     

       350
       350
       +
                       };

     

       352
       351
        
       

     

       353
       353
       -
                   ramfsMountPoint = mkOption {

     

       354
       354
       -
                     default = "/crypt-ramfs";

     

       355
       355
       -
                     type = types.str;

     

       356
       356
       -
                     description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";

     

       357
       357
       -
                   };

     

       352
       352
       +
                       ramfsMountPoint = mkOption {

     

       353
       353
       +
                         default = "/crypt-ramfs";

     

       354
       354
       +
                         type = types.str;

     

       355
       355
       +
                         description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";

     

       356
       356
       +
                       };

     

       358
       357
        
       

     

       359
       359
       -
                   /* TODO: Add to the documentation of the current module:

     

       358
       358
       +
                       /* TODO: Add to the documentation of the current module:

     

       360
       359
        
       

     

       361
       361
       -
                      Options related to the storing the salt.

     

       362
       362
       -
                   */

     

       363
       363
       -
                   storage = {

     

       364
       364
       -
                     device = mkOption {

     

       365
       365
       -
                       default = "/dev/sda1";

     

       366
       366
       -
                       type = types.path;

     

       367
       367
       -
                       description = ''

     

       368
       368
       -
                         An unencrypted device that will temporarily be mounted in stage-1.

     

       369
       369
       -
                         Must contain the current salt to create the challenge for this LUKS device.

     

       370
       370
       -
                       '';

     

       371
       371
       -
                     };

     

       360
       360
       +
                          Options related to the storing the salt.

     

       361
       361
       +
                       */

     

       362
       362
       +
                       storage = {

     

       363
       363
       +
                         device = mkOption {

     

       364
       364
       +
                           default = "/dev/sda1";

     

       365
       365
       +
                           type = types.path;

     

       366
       366
       +
                           description = ''

     

       367
       367
       +
                             An unencrypted device that will temporarily be mounted in stage-1.

     

       368
       368
       +
                             Must contain the current salt to create the challenge for this LUKS device.

     

       369
       369
       +
                           '';

     

       370
       370
       +
                         };

     

       372
       371
        
       

     

       373
       373
       -
                     fsType = mkOption {

     

       374
       374
       -
                       default = "vfat";

     

       375
       375
       -
                       type = types.str;

     

       376
       376
       -
                       description = "The filesystem of the unencrypted device.";

     

       377
       377
       -
                     };

     

       372
       372
       +
                         fsType = mkOption {

     

       373
       373
       +
                           default = "vfat";

     

       374
       374
       +
                           type = types.str;

     

       375
       375
       +
                           description = "The filesystem of the unencrypted device.";

     

       376
       376
       +
                         };

     

       378
       377
        
       

     

       379
       379
       -
                     mountPoint = mkOption {

     

       380
       380
       -
                       default = "/crypt-storage";

     

       381
       381
       -
                       type = types.str;

     

       382
       382
       -
                       description = "Path where the unencrypted device will be mounted during early boot.";

     

       383
       383
       -
                     };

     

       378
       378
       +
                         mountPoint = mkOption {

     

       379
       379
       +
                           default = "/crypt-storage";

     

       380
       380
       +
                           type = types.str;

     

       381
       381
       +
                           description = "Path where the unencrypted device will be mounted during early boot.";

     

       382
       382
       +
                         };

     

       384
       383
        
       

     

       385
       385
       -
                     path = mkOption {

     

       386
       386
       -
                       default = "/crypt-storage/default";

     

       387
       387
       -
                       type = types.str;

     

       388
       388
       -
                       description = ''

     

       389
       389
       -
                         Absolute path of the salt on the unencrypted device with

     

       390
       390
       -
                         that device's root directory as "/".

     

       391
       391
       -
                       '';

     

       384
       384
       +
                         path = mkOption {

     

       385
       385
       +
                           default = "/crypt-storage/default";

     

       386
       386
       +
                           type = types.str;

     

       387
       387
       +
                           description = ''

     

       388
       388
       +
                             Absolute path of the salt on the unencrypted device with

     

       389
       389
       +
                             that device's root directory as "/".

     

       390
       390
       +
                           '';

     

       391
       391
       +
                         };

     

       392
       392
       +
                       };

     

       392
       393
        
                     };

     

       393
       393
       -
                   };

     

       394
       394
       +
                   });

     

       394
       395
        
                 };

     

       395
       395
       -
               };

     

       396
       396
        
       

     

       397
       397
       -
             }; };

     

       397
       397
       +
               }; }));

     

       398
       398
        
           };

     

       399
       399
        
       

     

       400
       400
        
           boot.initrd.luks.yubikeySupport = mkOption {

+8 -13

nixos/modules/system/boot/networkd.nix

···

       471
       471
        
       

     

       472
       472
        
           addresses = mkOption {

     

       473
       473
        
             default = [ ];

     

       474
       474
       -
             type = types.listOf types.optionSet;

     

       475
       475
       -
             options = [ addressOptions ];

     

       474
       474
       +
             type = with types; listOf (submodule [ addressOptions ]);

     

       476
       475
        
             description = ''

     

       477
       476
        
               A list of address sections to be added to the unit.  See

     

       478
       477
        
               <citerefentry><refentrytitle>systemd.network</refentrytitle>

     
···

       482
       481
        
       

     

       483
       482
        
           routes = mkOption {

     

       484
       483
        
             default = [ ];

     

       485
       485
       -
             type = types.listOf types.optionSet;

     

       486
       486
       -
             options = [ routeOptions ];

     

       484
       484
       +
             type = with types; listOf (submodule [ routeOptions ]);

     

       487
       485
        
             description = ''

     

       488
       486
        
               A list of route sections to be added to the unit.  See

     

       489
       487
        
               <citerefentry><refentrytitle>systemd.network</refentrytitle>

     
···

       624
       622
        
       

     

       625
       623
        
           systemd.network.links = mkOption {

     

       626
       624
        
             default = {};

     

       627
       627
       -
             type = types.attrsOf types.optionSet;

     

       628
       628
       -
             options = [ linkOptions ];

     

       625
       625
       +
             type = with types; attrsOf (submodule [ linkOptions ]);

     

       629
       626
        
             description = "Definition of systemd network links.";

     

       630
       627
        
           };

     

       631
       628
        
       

     

       632
       629
        
           systemd.network.netdevs = mkOption {

     

       633
       630
        
             default = {};

     

       634
       634
       -
             type = types.attrsOf types.optionSet;

     

       635
       635
       -
             options = [ netdevOptions ];

     

       631
       631
       +
             type = with types; attrsOf (submodule [ netdevOptions ]);

     

       636
       632
        
             description = "Definition of systemd network devices.";

     

       637
       633
        
           };

     

       638
       634
        
       

     

       639
       635
        
           systemd.network.networks = mkOption {

     

       640
       636
        
             default = {};

     

       641
       641
       -
             type = types.attrsOf types.optionSet;

     

       642
       642
       -
             options = [ networkOptions networkConfig ];

     

       637
       637
       +
             type = with types; attrsOf (submodule [ networkOptions networkConfig ]);

     

       643
       638
        
             description = "Definition of systemd networks.";

     

       644
       639
        
           };

     

       645
       640
        
       

     

       646
       641
        
           systemd.network.units = mkOption {

     

       647
       642
        
             description = "Definition of networkd units.";

     

       648
       643
        
             default = {};

     

       649
       649
       -
             type = types.attrsOf types.optionSet;

     

       650
       650
       -
             options = { name, config, ... }:

     

       644
       644
       +
             type = with types; attrsOf (submodule (

     

       645
       645
       +
               { name, config, ... }:

     

       651
       646
        
               { options = concreteUnitOptions;

     

       652
       647
        
                 config = {

     

       653
       648
        
                   unit = mkDefault (makeUnit name config);

     

       654
       649
        
                 };

     

       655
       655
       -
               };

     

       650
       650
       +
               }));

     

       656
       651
        
           };

     

       657
       652
        
       

     

       658
       653
        
         };

+16 -26

nixos/modules/system/boot/systemd.nix

···

       389
       389
        
           systemd.units = mkOption {

     

       390
       390
        
             description = "Definition of systemd units.";

     

       391
       391
        
             default = {};

     

       392
       392
       -
             type = types.attrsOf types.optionSet;

     

       393
       393
       -
             options = { name, config, ... }:

     

       392
       392
       +
             type = with types; attrsOf (submodule (

     

       393
       393
       +
               { name, config, ... }:

     

       394
       394
        
               { options = concreteUnitOptions;

     

       395
       395
        
                 config = {

     

       396
       396
        
                   unit = mkDefault (makeUnit name config);

     

       397
       397
        
                 };

     

       398
       398
       -
               };

     

       398
       398
       +
               }));

     

       399
       399
        
           };

     

       400
       400
        
       

     

       401
       401
        
           systemd.packages = mkOption {

     
···

       406
       406
        
       

     

       407
       407
        
           systemd.targets = mkOption {

     

       408
       408
        
             default = {};

     

       409
       409
       -
             type = types.attrsOf types.optionSet;

     

       410
       410
       -
             options = [ targetOptions unitConfig ];

     

       409
       409
       +
             type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] );

     

       411
       410
        
             description = "Definition of systemd target units.";

     

       412
       411
        
           };

     

       413
       412
        
       

     

       414
       413
        
           systemd.services = mkOption {

     

       415
       414
        
             default = {};

     

       416
       416
       -
             type = types.attrsOf types.optionSet;

     

       417
       417
       -
             options = [ serviceOptions unitConfig serviceConfig ];

     

       415
       415
       +
             type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ]);

     

       418
       416
        
             description = "Definition of systemd service units.";

     

       419
       417
        
           };

     

       420
       418
        
       

     

       421
       419
        
           systemd.sockets = mkOption {

     

       422
       420
        
             default = {};

     

       423
       423
       -
             type = types.attrsOf types.optionSet;

     

       424
       424
       -
             options = [ socketOptions unitConfig ];

     

       421
       421
       +
             type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ]);

     

       425
       422
        
             description = "Definition of systemd socket units.";

     

       426
       423
        
           };

     

       427
       424
        
       

     

       428
       425
        
           systemd.timers = mkOption {

     

       429
       426
        
             default = {};

     

       430
       430
       -
             type = types.attrsOf types.optionSet;

     

       431
       431
       -
             options = [ timerOptions unitConfig ];

     

       427
       427
       +
             type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ]);

     

       432
       428
        
             description = "Definition of systemd timer units.";

     

       433
       429
        
           };

     

       434
       430
        
       

     

       435
       431
        
           systemd.paths = mkOption {

     

       436
       432
        
             default = {};

     

       437
       437
       -
             type = types.attrsOf types.optionSet;

     

       438
       438
       -
             options = [ pathOptions unitConfig ];

     

       433
       433
       +
             type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]);

     

       439
       434
        
             description = "Definition of systemd path units.";

     

       440
       435
        
           };

     

       441
       436
        
       

     

       442
       437
        
           systemd.mounts = mkOption {

     

       443
       438
        
             default = [];

     

       444
       444
       -
             type = types.listOf types.optionSet;

     

       445
       445
       -
             options = [ mountOptions unitConfig mountConfig ];

     

       439
       439
       +
             type = with types; listOf (submodule [ { options = mountOptions; } unitConfig mountConfig ]);

     

       446
       440
        
             description = ''

     

       447
       441
        
               Definition of systemd mount units.

     

       448
       442
        
               This is a list instead of an attrSet, because systemd mandates the names to be derived from

     
···

       452
       446
        
       

     

       453
       447
        
           systemd.automounts = mkOption {

     

       454
       448
        
             default = [];

     

       455
       455
       -
             type = types.listOf types.optionSet;

     

       456
       456
       -
             options = [ automountOptions unitConfig automountConfig ];

     

       449
       449
       +
             type = with types; listOf (submodule [ { options = automountOptions; } unitConfig automountConfig ]);

     

       457
       450
        
             description = ''

     

       458
       451
        
               Definition of systemd automount units.

     

       459
       452
        
               This is a list instead of an attrSet, because systemd mandates the names to be derived from

     
···

       600
       593
        
           systemd.user.units = mkOption {

     

       601
       594
        
             description = "Definition of systemd per-user units.";

     

       602
       595
        
             default = {};

     

       603
       603
       -
             type = types.attrsOf types.optionSet;

     

       604
       604
       -
             options = { name, config, ... }:

     

       596
       596
       +
             type = with types; attrsOf (submodule (

     

       597
       597
       +
               { name, config, ... }:

     

       605
       598
        
               { options = concreteUnitOptions;

     

       606
       599
        
                 config = {

     

       607
       600
        
                   unit = mkDefault (makeUnit name config);

     

       608
       601
        
                 };

     

       609
       609
       -
               };

     

       602
       602
       +
               }));

     

       610
       603
        
           };

     

       611
       604
        
       

     

       612
       605
        
           systemd.user.services = mkOption {

     

       613
       606
        
             default = {};

     

       614
       614
       -
             type = types.attrsOf types.optionSet;

     

       615
       615
       -
             options = [ serviceOptions unitConfig serviceConfig ];

     

       607
       607
       +
             type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] );

     

       616
       608
        
             description = "Definition of systemd per-user service units.";

     

       617
       609
        
           };

     

       618
       610
        
       

     

       619
       611
        
           systemd.user.timers = mkOption {

     

       620
       612
        
             default = {};

     

       621
       621
       -
             type = types.attrsOf types.optionSet;

     

       622
       622
       -
             options = [ timerOptions unitConfig ];

     

       613
       613
       +
             type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] );

     

       623
       614
        
             description = "Definition of systemd per-user timer units.";

     

       624
       615
        
           };

     

       625
       616
        
       

     

       626
       617
        
           systemd.user.sockets = mkOption {

     

       627
       618
        
             default = {};

     

       628
       628
       -
             type = types.attrsOf types.optionSet;

     

       629
       629
       -
             options = [ socketOptions unitConfig ];

     

       619
       619
       +
             type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ] );

     

       630
       620
        
             description = "Definition of systemd per-user socket units.";

     

       631
       621
        
           };

     

       632
       622

+3 -3

nixos/modules/system/etc/etc.nix

···

       33
       33
        
         options = {

     

       34
       34
        
       

     

       35
       35
        
           environment.etc = mkOption {

     

       36
       36
       -
             type = types.loaOf types.optionSet;

     

       37
       36
        
             default = {};

     

       38
       37
        
             example = literalExample ''

     

       39
       38
        
               { example-configuration-file =

     
···

       47
       46
        
               Set of files that have to be linked in <filename>/etc</filename>.

     

       48
       47
        
             '';

     

       49
       48
        
       

     

       50
       50
       -
             options = singleton ({ name, config, ... }:

     

       49
       49
       +
             type = with types; loaOf (submodule (

     

       50
       50
       +
               { name, config, ... }:

     

       51
       51
        
               { options = {

     

       52
       52
        
       

     

       53
       53
        
                   enable = mkOption {

     
···

       117
       117
        
                     in mkDefault (pkgs.writeText name' config.text));

     

       118
       118
        
                 };

     

       119
       119
        
       

     

       120
       120
       -
               });

     

       120
       120
       +
               }));

     

       121
       121
        
       

     

       122
       122
        
           };

     

       123
       123

+252 -238

nixos/modules/tasks/network-interfaces.nix

···

       97
       97
        
       

     

       98
       98
        
         addrOpts = v:

     

       99
       99
        
           assert v == 4 || v == 6;

     

       100
       100
       -
           {

     

       101
       101
       -
             address = mkOption {

     

       102
       102
       -
               type = types.str;

     

       103
       103
       -
               description = ''

     

       104
       104
       -
                 IPv${toString v} address of the interface.  Leave empty to configure the

     

       105
       105
       -
                 interface using DHCP.

     

       106
       106
       -
               '';

     

       107
       107
       -
             };

     

       100
       100
       +
           { options = {

     

       101
       101
       +
               address = mkOption {

     

       102
       102
       +
                 type = types.str;

     

       103
       103
       +
                 description = ''

     

       104
       104
       +
                   IPv${toString v} address of the interface.  Leave empty to configure the

     

       105
       105
       +
                   interface using DHCP.

     

       106
       106
       +
                 '';

     

       107
       107
       +
               };

     

       108
       108
        
       

     

       109
       109
       -
             prefixLength = mkOption {

     

       110
       110
       -
               type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));

     

       111
       111
       -
               description = ''

     

       112
       112
       -
                 Subnet mask of the interface, specified as the number of

     

       113
       113
       -
                 bits in the prefix (<literal>${if v == 4 then "24" else "64"}</literal>).

     

       114
       114
       -
               '';

     

       109
       109
       +
               prefixLength = mkOption {

     

       110
       110
       +
                 type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));

     

       111
       111
       +
                 description = ''

     

       112
       112
       +
                   Subnet mask of the interface, specified as the number of

     

       113
       113
       +
                   bits in the prefix (<literal>${if v == 4 then "24" else "64"}</literal>).

     

       114
       114
       +
                 '';

     

       115
       115
       +
               };

     

       115
       116
        
             };

     

       116
       117
        
           };

     

       117
       118
        
       

     
···

       141
       142
        
                 { address = "10.0.0.1"; prefixLength = 16; }

     

       142
       143
        
                 { address = "192.168.1.1"; prefixLength = 24; }

     

       143
       144
        
               ];

     

       144
       144
       -
               type = types.listOf types.optionSet;

     

       145
       145
       -
               options = addrOpts 4;

     

       145
       145
       +
               type = with types; listOf (submodule (addrOpts 4));

     

       146
       146
        
               description = ''

     

       147
       147
        
                 List of IPv4 addresses that will be statically assigned to the interface.

     

       148
       148
        
               '';

     
···

       154
       154
        
                 { address = "fdfd:b3f0:482::1"; prefixLength = 48; }

     

       155
       155
        
                 { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; }

     

       156
       156
        
               ];

     

       157
       157
       -
               type = types.listOf types.optionSet;

     

       158
       158
       -
               options = addrOpts 6;

     

       157
       157
       +
               type = with types; listOf (submodule (addrOpts 6));

     

       159
       158
        
               description = ''

     

       160
       159
        
                 List of IPv6 addresses that will be statically assigned to the interface.

     

       161
       160
        
               '';

     
···

       415
       414
        
               <option>networking.useDHCP</option> is true, then every

     

       416
       415
        
               interface not listed here will be configured using DHCP.

     

       417
       416
        
             '';

     

       418
       418
       -
             type = types.loaOf types.optionSet;

     

       419
       419
       -
             options = [ interfaceOpts ];

     

       417
       417
       +
             type = with types; loaOf (submodule interfaceOpts);

     

       420
       418
        
           };

     

       421
       419
        
       

     

       422
       420
        
           networking.vswitches = mkOption {

     
···

       434
       432
        
                 interface.

     

       435
       433
        
               '';

     

       436
       434
        
       

     

       437
       437
       -
             type = types.attrsOf types.optionSet;

     

       435
       435
       +
             type = with types; attrsOf (submodule {

     

       438
       436
        
       

     

       439
       439
       -
             options = {

     

       437
       437
       +
               options = {

     

       438
       438
       +
       

     

       439
       439
       +
                 interfaces = mkOption {

     

       440
       440
       +
                   example = [ "eth0" "eth1" ];

     

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

     

       442
       442
       +
                   description =

     

       443
       443
       +
                     "The physical network interfaces connected by the vSwitch.";

     

       444
       444
       +
                 };

     

       440
       445
        
       

     

       441
       441
       -
               interfaces = mkOption {

     

       442
       442
       -
                 example = [ "eth0" "eth1" ];

     

       443
       443
       -
                 type = types.listOf types.str;

     

       444
       444
       -
                 description =

     

       445
       445
       -
                   "The physical network interfaces connected by the vSwitch.";

     

       446
       446
       -
               };

     

       446
       446
       +
                 controllers = mkOption {

     

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

     

       448
       448
       +
                   default = [];

     

       449
       449
       +
                   example = [ "ptcp:6653:[::1]" ];

     

       450
       450
       +
                   description = ''

     

       451
       451
       +
                     Specify the controller targets. For the allowed options see <literal>man 8 ovs-vsctl</literal>.

     

       452
       452
       +
                   '';

     

       453
       453
       +
                 };

     

       447
       454
        
       

     

       448
       448
       -
               controllers = mkOption {

     

       449
       449
       -
                 type = types.listOf types.str;

     

       450
       450
       -
                 default = [];

     

       451
       451
       -
                 example = [ "ptcp:6653:[::1]" ];

     

       452
       452
       -
                 description = ''

     

       453
       453
       -
                   Specify the controller targets. For the allowed options see <literal>man 8 ovs-vsctl</literal>.

     

       454
       454
       -
                 '';

     

       455
       455
       -
               };

     

       455
       455
       +
                 openFlowRules = mkOption {

     

       456
       456
       +
                   type = types.lines;

     

       457
       457
       +
                   default = "";

     

       458
       458
       +
                   example = ''

     

       459
       459
       +
                     actions=normal

     

       460
       460
       +
                   '';

     

       461
       461
       +
                   description = ''

     

       462
       462
       +
                     OpenFlow rules to insert into the Open vSwitch. All <literal>openFlowRules</literal> are

     

       463
       463
       +
                     loaded with <literal>ovs-ofctl</literal> within one atomic operation.

     

       464
       464
       +
                   '';

     

       465
       465
       +
                 };

     

       456
       466
        
       

     

       457
       457
       -
               openFlowRules = mkOption {

     

       458
       458
       -
                 type = types.lines;

     

       459
       459
       -
                 default = "";

     

       460
       460
       -
                 example = ''

     

       461
       461
       -
                   actions=normal

     

       462
       462
       -
                 '';

     

       463
       463
       -
                 description = ''

     

       464
       464
       -
                   OpenFlow rules to insert into the Open vSwitch. All <literal>openFlowRules</literal> are

     

       465
       465
       -
                   loaded with <literal>ovs-ofctl</literal> within one atomic operation.

     

       466
       466
       -
                 '';

     

       467
       467
       -
               };

     

       467
       467
       +
                 extraOvsctlCmds = mkOption {

     

       468
       468
       +
                   type = types.lines;

     

       469
       469
       +
                   default = "";

     

       470
       470
       +
                   example = ''

     

       471
       471
       +
                     set-fail-mode <switch_name> secure

     

       472
       472
       +
                     set Bridge <switch_name> stp_enable=true

     

       473
       473
       +
                   '';

     

       474
       474
       +
                   description = ''

     

       475
       475
       +
                     Commands to manipulate the Open vSwitch database. Every line executed with <literal>ovs-vsctl</literal>.

     

       476
       476
       +
                     All commands are bundled together with the operations for adding the interfaces

     

       477
       477
       +
                     into one atomic operation.

     

       478
       478
       +
                   '';

     

       479
       479
       +
                 };

     

       468
       480
        
       

     

       469
       469
       -
               extraOvsctlCmds = mkOption {

     

       470
       470
       -
                 type = types.lines;

     

       471
       471
       -
                 default = "";

     

       472
       472
       -
                 example = ''

     

       473
       473
       -
                   set-fail-mode <switch_name> secure

     

       474
       474
       -
                   set Bridge <switch_name> stp_enable=true

     

       475
       475
       -
                 '';

     

       476
       476
       -
                 description = ''

     

       477
       477
       -
                   Commands to manipulate the Open vSwitch database. Every line executed with <literal>ovs-vsctl</literal>.

     

       478
       478
       -
                   All commands are bundled together with the operations for adding the interfaces

     

       479
       479
       -
                   into one atomic operation.

     

       480
       480
       -
                 '';

     

       481
       481
        
               };

     

       482
       482
        
       

     

       483
       483
       -
             };

     

       483
       483
       +
             });

     

       484
       484
        
       

     

       485
       485
        
           };

     

       486
       486
        
       

     
···

       499
       499
        
                 bridge's network interface.

     

       500
       500
        
               '';

     

       501
       501
        
       

     

       502
       502
       -
             type = types.attrsOf types.optionSet;

     

       502
       502
       +
             type = with types; attrsOf (submodule {

     

       503
       503
        
       

     

       504
       504
       -
             options = {

     

       504
       504
       +
               options = {

     

       505
       505
        
       

     

       506
       506
       -
               interfaces = mkOption {

     

       507
       507
       -
                 example = [ "eth0" "eth1" ];

     

       508
       508
       -
                 type = types.listOf types.str;

     

       509
       509
       -
                 description =

     

       510
       510
       -
                   "The physical network interfaces connected by the bridge.";

     

       511
       511
       -
               };

     

       506
       506
       +
                 interfaces = mkOption {

     

       507
       507
       +
                   example = [ "eth0" "eth1" ];

     

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

     

       509
       509
       +
                   description =

     

       510
       510
       +
                     "The physical network interfaces connected by the bridge.";

     

       511
       511
       +
                 };

     

       512
       512
        
       

     

       513
       513
       -
               rstp = mkOption {

     

       514
       514
       -
                 example = true;

     

       515
       515
       -
                 default = false;

     

       516
       516
       -
                 type = types.bool;

     

       517
       517
       -
                 description = "Whether the bridge interface should enable rstp.";

     

       513
       513
       +
                 rstp = mkOption {

     

       514
       514
       +
                   example = true;

     

       515
       515
       +
                   default = false;

     

       516
       516
       +
                   type = types.bool;

     

       517
       517
       +
                   description = "Whether the bridge interface should enable rstp.";

     

       518
       518
       +
                 };

     

       519
       519
       +
       

     

       518
       520
        
               };

     

       519
       521
        
       

     

       520
       520
       -
             };

     

       522
       522
       +
             });

     

       521
       523
        
       

     

       522
       524
        
           };

     

       523
       525
        
       

     
···

       538
       540
        
               name specifying the name of the bond's network interface

     

       539
       541
        
             '';

     

       540
       542
        
       

     

       541
       541
       -
             type = types.attrsOf types.optionSet;

     

       543
       543
       +
             type = with types; attrsOf (submodule {

     

       544
       544
       +
       

     

       545
       545
       +
               options = {

     

       542
       546
        
       

     

       543
       543
       -
             options = {

     

       547
       547
       +
                 interfaces = mkOption {

     

       548
       548
       +
                   example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];

     

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

     

       550
       550
       +
                   description = "The interfaces to bond together";

     

       551
       551
       +
                 };

     

       544
       552
        
       

     

       545
       545
       -
               interfaces = mkOption {

     

       546
       546
       -
                 example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];

     

       547
       547
       -
                 type = types.listOf types.str;

     

       548
       548
       -
                 description = "The interfaces to bond together";

     

       549
       549
       -
               };

     

       553
       553
       +
                 lacp_rate = mkOption {

     

       554
       554
       +
                   default = null;

     

       555
       555
       +
                   example = "fast";

     

       556
       556
       +
                   type = types.nullOr types.str;

     

       557
       557
       +
                   description = ''

     

       558
       558
       +
                     Option specifying the rate in which we'll ask our link partner

     

       559
       559
       +
                     to transmit LACPDU packets in 802.3ad mode.

     

       560
       560
       +
                   '';

     

       561
       561
       +
                 };

     

       550
       562
        
       

     

       551
       551
       -
               lacp_rate = mkOption {

     

       552
       552
       -
                 default = null;

     

       553
       553
       -
                 example = "fast";

     

       554
       554
       -
                 type = types.nullOr types.str;

     

       555
       555
       -
                 description = ''

     

       556
       556
       -
                   Option specifying the rate in which we'll ask our link partner

     

       557
       557
       -
                   to transmit LACPDU packets in 802.3ad mode.

     

       558
       558
       -
                 '';

     

       559
       559
       -
               };

     

       563
       563
       +
                 miimon = mkOption {

     

       564
       564
       +
                   default = null;

     

       565
       565
       +
                   example = 100;

     

       566
       566
       +
                   type = types.nullOr types.int;

     

       567
       567
       +
                   description = ''

     

       568
       568
       +
                     Miimon is the number of millisecond in between each round of polling

     

       569
       569
       +
                     by the device driver for failed links. By default polling is not

     

       570
       570
       +
                     enabled and the driver is trusted to properly detect and handle

     

       571
       571
       +
                     failure scenarios.

     

       572
       572
       +
                   '';

     

       573
       573
       +
                 };

     

       560
       574
        
       

     

       561
       561
       -
               miimon = mkOption {

     

       562
       562
       -
                 default = null;

     

       563
       563
       -
                 example = 100;

     

       564
       564
       -
                 type = types.nullOr types.int;

     

       565
       565
       -
                 description = ''

     

       566
       566
       -
                   Miimon is the number of millisecond in between each round of polling

     

       567
       567
       -
                   by the device driver for failed links. By default polling is not

     

       568
       568
       -
                   enabled and the driver is trusted to properly detect and handle

     

       569
       569
       -
                   failure scenarios.

     

       570
       570
       -
                 '';

     

       571
       571
       -
               };

     

       575
       575
       +
                 mode = mkOption {

     

       576
       576
       +
                   default = null;

     

       577
       577
       +
                   example = "active-backup";

     

       578
       578
       +
                   type = types.nullOr types.str;

     

       579
       579
       +
                   description = ''

     

       580
       580
       +
                     The mode which the bond will be running. The default mode for

     

       581
       581
       +
                     the bonding driver is balance-rr, optimizing for throughput.

     

       582
       582
       +
                     More information about valid modes can be found at

     

       583
       583
       +
                     https://www.kernel.org/doc/Documentation/networking/bonding.txt

     

       584
       584
       +
                   '';

     

       585
       585
       +
                 };

     

       572
       586
        
       

     

       573
       573
       -
               mode = mkOption {

     

       574
       574
       -
                 default = null;

     

       575
       575
       -
                 example = "active-backup";

     

       576
       576
       -
                 type = types.nullOr types.str;

     

       577
       577
       -
                 description = ''

     

       578
       578
       -
                   The mode which the bond will be running. The default mode for

     

       579
       579
       -
                   the bonding driver is balance-rr, optimizing for throughput.

     

       580
       580
       -
                   More information about valid modes can be found at

     

       581
       581
       -
                   https://www.kernel.org/doc/Documentation/networking/bonding.txt

     

       582
       582
       -
                 '';

     

       583
       583
       -
               };

     

       587
       587
       +
                 xmit_hash_policy = mkOption {

     

       588
       588
       +
                   default = null;

     

       589
       589
       +
                   example = "layer2+3";

     

       590
       590
       +
                   type = types.nullOr types.str;

     

       591
       591
       +
                   description = ''

     

       592
       592
       +
                     Selects the transmit hash policy to use for slave selection in

     

       593
       593
       +
                     balance-xor, 802.3ad, and tlb modes.

     

       594
       594
       +
                   '';

     

       595
       595
       +
                 };

     

       584
       596
        
       

     

       585
       585
       -
               xmit_hash_policy = mkOption {

     

       586
       586
       -
                 default = null;

     

       587
       587
       -
                 example = "layer2+3";

     

       588
       588
       -
                 type = types.nullOr types.str;

     

       589
       589
       -
                 description = ''

     

       590
       590
       -
                   Selects the transmit hash policy to use for slave selection in

     

       591
       591
       -
                   balance-xor, 802.3ad, and tlb modes.

     

       592
       592
       -
                 '';

     

       593
       597
        
               };

     

       594
       598
        
       

     

       595
       595
       -
             };

     

       599
       599
       +
             });

     

       596
       600
        
           };

     

       597
       601
        
       

     

       598
       602
        
           networking.macvlans = mkOption {

     

       599
       599
       -
             type = types.attrsOf types.optionSet;

     

       600
       603
        
             default = { };

     

       601
       604
        
             example = literalExample {

     

       602
       605
        
               wan = {

     
···

       608
       611
        
               This option allows you to define macvlan interfaces which should

     

       609
       612
        
               be automatically created.

     

       610
       613
        
             '';

     

       611
       611
       -
             options = {

     

       614
       614
       +
             type = with types; attrsOf (submodule {

     

       615
       615
       +
               options = {

     

       612
       616
        
       

     

       613
       613
       -
               interface = mkOption {

     

       614
       614
       -
                 example = "enp4s0";

     

       615
       615
       -
                 type = types.str;

     

       616
       616
       -
                 description = "The interface the macvlan will transmit packets through.";

     

       617
       617
       -
               };

     

       617
       617
       +
                 interface = mkOption {

     

       618
       618
       +
                   example = "enp4s0";

     

       619
       619
       +
                   type = types.str;

     

       620
       620
       +
                   description = "The interface the macvlan will transmit packets through.";

     

       621
       621
       +
                 };

     

       622
       622
       +
       

     

       623
       623
       +
                 mode = mkOption {

     

       624
       624
       +
                   default = null;

     

       625
       625
       +
                   type = types.nullOr types.str;

     

       626
       626
       +
                   example = "vepa";

     

       627
       627
       +
                   description = "The mode of the macvlan device.";

     

       628
       628
       +
                 };

     

       618
       629
        
       

     

       619
       619
       -
               mode = mkOption {

     

       620
       620
       -
                 default = null;

     

       621
       621
       -
                 type = types.nullOr types.str;

     

       622
       622
       -
                 example = "vepa";

     

       623
       623
       -
                 description = "The mode of the macvlan device.";

     

       624
       630
        
               };

     

       625
       631
        
       

     

       626
       626
       -
             };

     

       632
       632
       +
             });

     

       627
       633
        
           };

     

       628
       634
        
       

     

       629
       635
        
           networking.sits = mkOption {

     

       630
       630
       -
             type = types.attrsOf types.optionSet;

     

       631
       636
        
             default = { };

     

       632
       637
        
             example = literalExample {

     

       633
       638
        
               hurricane = {

     
···

       644
       649
        
             description = ''

     

       645
       650
        
               This option allows you to define 6-to-4 interfaces which should be automatically created.

     

       646
       651
        
             '';

     

       647
       647
       -
             options = {

     

       652
       652
       +
             type = with types; attrsOf (submodule {

     

       653
       653
       +
               options = {

     

       648
       654
        
       

     

       649
       649
       -
               remote = mkOption {

     

       650
       650
       -
                 type = types.nullOr types.str;

     

       651
       651
       -
                 default = null;

     

       652
       652
       -
                 example = "10.0.0.1";

     

       653
       653
       -
                 description = ''

     

       654
       654
       -
                   The address of the remote endpoint to forward traffic over.

     

       655
       655
       -
                 '';

     

       656
       656
       -
               };

     

       655
       655
       +
                 remote = mkOption {

     

       656
       656
       +
                   type = types.nullOr types.str;

     

       657
       657
       +
                   default = null;

     

       658
       658
       +
                   example = "10.0.0.1";

     

       659
       659
       +
                   description = ''

     

       660
       660
       +
                     The address of the remote endpoint to forward traffic over.

     

       661
       661
       +
                   '';

     

       662
       662
       +
                 };

     

       663
       663
       +
       

     

       664
       664
       +
                 local = mkOption {

     

       665
       665
       +
                   type = types.nullOr types.str;

     

       666
       666
       +
                   default = null;

     

       667
       667
       +
                   example = "10.0.0.22";

     

       668
       668
       +
                   description = ''

     

       669
       669
       +
                     The address of the local endpoint which the remote

     

       670
       670
       +
                     side should send packets to.

     

       671
       671
       +
                   '';

     

       672
       672
       +
                 };

     

       657
       673
        
       

     

       658
       658
       -
               local = mkOption {

     

       659
       659
       -
                 type = types.nullOr types.str;

     

       660
       660
       -
                 default = null;

     

       661
       661
       -
                 example = "10.0.0.22";

     

       662
       662
       -
                 description = ''

     

       663
       663
       -
                   The address of the local endpoint which the remote

     

       664
       664
       -
                   side should send packets to.

     

       665
       665
       -
                 '';

     

       666
       666
       -
               };

     

       674
       674
       +
                 ttl = mkOption {

     

       675
       675
       +
                   type = types.nullOr types.int;

     

       676
       676
       +
                   default = null;

     

       677
       677
       +
                   example = 255;

     

       678
       678
       +
                   description = ''

     

       679
       679
       +
                     The time-to-live of the connection to the remote tunnel endpoint.

     

       680
       680
       +
                   '';

     

       681
       681
       +
                 };

     

       667
       682
        
       

     

       668
       668
       -
               ttl = mkOption {

     

       669
       669
       -
                 type = types.nullOr types.int;

     

       670
       670
       -
                 default = null;

     

       671
       671
       -
                 example = 255;

     

       672
       672
       -
                 description = ''

     

       673
       673
       -
                   The time-to-live of the connection to the remote tunnel endpoint.

     

       674
       674
       -
                 '';

     

       675
       675
       -
               };

     

       683
       683
       +
                 dev = mkOption {

     

       684
       684
       +
                   type = types.nullOr types.str;

     

       685
       685
       +
                   default = null;

     

       686
       686
       +
                   example = "enp4s0f0";

     

       687
       687
       +
                   description = ''

     

       688
       688
       +
                     The underlying network device on which the tunnel resides.

     

       689
       689
       +
                   '';

     

       690
       690
       +
                 };

     

       676
       691
        
       

     

       677
       677
       -
               dev = mkOption {

     

       678
       678
       -
                 type = types.nullOr types.str;

     

       679
       679
       -
                 default = null;

     

       680
       680
       -
                 example = "enp4s0f0";

     

       681
       681
       -
                 description = ''

     

       682
       682
       -
                   The underlying network device on which the tunnel resides.

     

       683
       683
       -
                 '';

     

       684
       692
        
               };

     

       685
       693
        
       

     

       686
       686
       -
             };

     

       694
       694
       +
             });

     

       687
       695
        
           };

     

       688
       696
        
       

     

       689
       697
        
           networking.vlans = mkOption {

     
···

       706
       714
        
                 specifying the name of the vlan interface.

     

       707
       715
        
               '';

     

       708
       716
        
       

     

       709
       709
       -
             type = types.attrsOf types.optionSet;

     

       717
       717
       +
             type = with types; attrsOf (submodule {

     

       710
       718
        
       

     

       711
       711
       -
             options = {

     

       719
       719
       +
               options = {

     

       712
       720
        
       

     

       713
       713
       -
               id = mkOption {

     

       714
       714
       -
                 example = 1;

     

       715
       715
       -
                 type = types.int;

     

       716
       716
       -
                 description = "The vlan identifier";

     

       721
       721
       +
                 id = mkOption {

     

       722
       722
       +
                   example = 1;

     

       723
       723
       +
                   type = types.int;

     

       724
       724
       +
                   description = "The vlan identifier";

     

       725
       725
       +
                 };

     

       726
       726
       +
       

     

       727
       727
       +
                 interface = mkOption {

     

       728
       728
       +
                   example = "enp4s0";

     

       729
       729
       +
                   type = types.str;

     

       730
       730
       +
                   description = "The interface the vlan will transmit packets through.";

     

       731
       731
       +
                 };

     

       732
       732
       +
       

     

       717
       733
        
               };

     

       718
       734
        
       

     

       719
       719
       -
               interface = mkOption {

     

       720
       720
       -
                 example = "enp4s0";

     

       721
       721
       -
                 type = types.str;

     

       722
       722
       -
                 description = "The interface the vlan will transmit packets through.";

     

       723
       723
       -
               };

     

       735
       735
       +
             });

     

       724
       736
        
       

     

       725
       725
       -
             };

     

       726
       737
        
           };

     

       727
       738
        
       

     

       728
       739
        
           networking.wlanInterfaces = mkOption {

     
···

       760
       771
        
                 would have to be created explicitly.

     

       761
       772
        
               '';

     

       762
       773
        
       

     

       763
       763
       -
             type = types.attrsOf types.optionSet;

     

       774
       774
       +
             type = with types; attrsOf (submodule {

     

       764
       775
        
       

     

       765
       765
       -
             options = {

     

       776
       776
       +
               options = {

     

       766
       777
        
       

     

       767
       767
       -
               device = mkOption {

     

       768
       768
       -
                 type = types.string;

     

       769
       769
       -
                 example = "wlp6s0";

     

       770
       770
       -
                 description = "The name of the underlying hardware WLAN device as assigned by <literal>udev</literal>.";

     

       771
       771
       -
               };

     

       778
       778
       +
                 device = mkOption {

     

       779
       779
       +
                   type = types.string;

     

       780
       780
       +
                   example = "wlp6s0";

     

       781
       781
       +
                   description = "The name of the underlying hardware WLAN device as assigned by <literal>udev</literal>.";

     

       782
       782
       +
                 };

     

       772
       783
        
       

     

       773
       773
       -
               type = mkOption {

     

       774
       774
       -
                 type = types.string;

     

       775
       775
       -
                 default = "managed";

     

       776
       776
       -
                 example = "ibss";

     

       777
       777
       -
                 description = ''

     

       778
       778
       -
                   The type of the WLAN interface. The type has to be either <literal>managed</literal>,

     

       779
       779
       -
                   <literal>ibss</literal>, <literal>monitor</literal>, <literal>mesh</literal> or <literal>wds</literal>.

     

       780
       780
       -
                   Also, the type has to be supported by the underlying hardware of the device.

     

       781
       781
       -
                 '';

     

       782
       782
       -
               };

     

       784
       784
       +
                 type = mkOption {

     

       785
       785
       +
                   type = types.string;

     

       786
       786
       +
                   default = "managed";

     

       787
       787
       +
                   example = "ibss";

     

       788
       788
       +
                   description = ''

     

       789
       789
       +
                     The type of the WLAN interface. The type has to be either <literal>managed</literal>,

     

       790
       790
       +
                     <literal>ibss</literal>, <literal>monitor</literal>, <literal>mesh</literal> or <literal>wds</literal>.

     

       791
       791
       +
                     Also, the type has to be supported by the underlying hardware of the device.

     

       792
       792
       +
                   '';

     

       793
       793
       +
                 };

     

       783
       794
        
       

     

       784
       784
       -
               meshID = mkOption {

     

       785
       785
       -
                 type = types.nullOr types.string;

     

       786
       786
       -
                 default = null;

     

       787
       787
       -
                 description = "MeshID of interface with type <literal>mesh</literal>.";

     

       788
       788
       -
               };

     

       795
       795
       +
                 meshID = mkOption {

     

       796
       796
       +
                   type = types.nullOr types.string;

     

       797
       797
       +
                   default = null;

     

       798
       798
       +
                   description = "MeshID of interface with type <literal>mesh</literal>.";

     

       799
       799
       +
                 };

     

       789
       800
        
       

     

       790
       790
       -
               flags = mkOption {

     

       791
       791
       -
                 type = types.nullOr types.string;

     

       792
       792
       -
                 default = null;

     

       793
       793
       -
                 example = "control";

     

       794
       794
       -
                 description = ''

     

       795
       795
       -
                   Flags for interface of type <literal>monitor</literal>. The valid flags are:

     

       796
       796
       -
                   none:     no special flags

     

       797
       797
       -
                   fcsfail:  show frames with FCS errors

     

       798
       798
       -
                   control:  show control frames

     

       799
       799
       -
                   otherbss: show frames from other BSSes

     

       800
       800
       -
                   cook:     use cooked mode

     

       801
       801
       -
                   active:   use active mode (ACK incoming unicast packets)

     

       802
       802
       -
                 '';

     

       803
       803
       -
               };

     

       801
       801
       +
                 flags = mkOption {

     

       802
       802
       +
                   type = types.nullOr types.string;

     

       803
       803
       +
                   default = null;

     

       804
       804
       +
                   example = "control";

     

       805
       805
       +
                   description = ''

     

       806
       806
       +
                     Flags for interface of type <literal>monitor</literal>. The valid flags are:

     

       807
       807
       +
                     none:     no special flags

     

       808
       808
       +
                     fcsfail:  show frames with FCS errors

     

       809
       809
       +
                     control:  show control frames

     

       810
       810
       +
                     otherbss: show frames from other BSSes

     

       811
       811
       +
                     cook:     use cooked mode

     

       812
       812
       +
                     active:   use active mode (ACK incoming unicast packets)

     

       813
       813
       +
                   '';

     

       814
       814
       +
                 };

     

       815
       815
       +
       

     

       816
       816
       +
                 fourAddr = mkOption {

     

       817
       817
       +
                   type = types.nullOr types.bool;

     

       818
       818
       +
                   default = null;

     

       819
       819
       +
                   description = "Whether to enable <literal>4-address mode</literal> with type <literal>managed</literal>.";

     

       820
       820
       +
                 };

     

       804
       821
        
       

     

       805
       805
       -
               fourAddr = mkOption {

     

       806
       806
       -
                 type = types.nullOr types.bool;

     

       807
       807
       -
                 default = null;

     

       808
       808
       -
                 description = "Whether to enable <literal>4-address mode</literal> with type <literal>managed</literal>.";

     

       809
       809
       -
               };

     

       822
       822
       +
                 mac = mkOption {

     

       823
       823
       +
                   type = types.nullOr types.str;

     

       824
       824
       +
                   default = null;

     

       825
       825
       +
                   example = "02:00:00:00:00:01";

     

       826
       826
       +
                   description = ''

     

       827
       827
       +
                     MAC address to use for the device. If <literal>null</literal>, then the MAC of the

     

       828
       828
       +
                     underlying hardware WLAN device is used.

     

       810
       829
        
       

     

       811
       811
       -
               mac = mkOption {

     

       812
       812
       -
                 type = types.nullOr types.str;

     

       813
       813
       -
                 default = null;

     

       814
       814
       -
                 example = "02:00:00:00:00:01";

     

       815
       815
       -
                 description = ''

     

       816
       816
       -
                   MAC address to use for the device. If <literal>null</literal>, then the MAC of the

     

       817
       817
       -
                   underlying hardware WLAN device is used.

     

       830
       830
       +
                     INFO: Locally administered MAC addresses are of the form:

     

       831
       831
       +
                     <itemizedlist>

     

       832
       832
       +
                     <listitem><para>x2:xx:xx:xx:xx:xx</para></listitem>

     

       833
       833
       +
                     <listitem><para>x6:xx:xx:xx:xx:xx</para></listitem>

     

       834
       834
       +
                     <listitem><para>xA:xx:xx:xx:xx:xx</para></listitem>

     

       835
       835
       +
                     <listitem><para>xE:xx:xx:xx:xx:xx</para></listitem>

     

       836
       836
       +
                     </itemizedlist>

     

       837
       837
       +
                   '';

     

       838
       838
       +
                 };

     

       818
       839
        
       

     

       819
       819
       -
                   INFO: Locally administered MAC addresses are of the form:

     

       820
       820
       -
                   <itemizedlist>

     

       821
       821
       -
                   <listitem><para>x2:xx:xx:xx:xx:xx</para></listitem>

     

       822
       822
       -
                   <listitem><para>x6:xx:xx:xx:xx:xx</para></listitem>

     

       823
       823
       -
                   <listitem><para>xA:xx:xx:xx:xx:xx</para></listitem>

     

       824
       824
       -
                   <listitem><para>xE:xx:xx:xx:xx:xx</para></listitem>

     

       825
       825
       -
                   </itemizedlist>

     

       826
       826
       -
                 '';

     

       827
       840
        
               };

     

       828
       841
        
       

     

       829
       829
       -
             };

     

       842
       842
       +
             });

     

       843
       843
       +
       

     

       830
       844
        
           };

     

       831
       845
        
       

     

       832
       846
        
           networking.useDHCP = mkOption {

+2 -4

nixos/modules/virtualisation/containers.nix

···

       473
       473
        
                   };

     

       474
       474
        
       

     

       475
       475
        
                   extraVeths = mkOption {

     

       476
       476
       -
                     type = types.attrsOf types.optionSet;

     

       476
       476
       +
                     type = with types; attrsOf (submodule networkOptions);

     

       477
       477
        
                     default = {};

     

       478
       478
       -
                     options = networkOptions;

     

       479
       478
        
                     description = ''

     

       480
       479
        
                       Extra veth-pairs to be created for the container

     

       481
       480
        
                     '';

     
···

       490
       489
        
                   };

     

       491
       490
        
       

     

       492
       491
        
                   bindMounts = mkOption {

     

       493
       493
       -
                     type = types.loaOf types.optionSet;

     

       494
       494
       -
                     options = [ bindMountOpts ];

     

       492
       492
       +
                     type = with types; loaOf (submodule bindMountOpts);

     

       495
       493
        
                     default = {};

     

       496
       494
        
                     example = { "/home" = { hostPath = "/home/alice";

     

       497
       495
        
                                             isReadOnly = false; };