Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use attrsOf in place of loaOf when relevant #20456

Merged
merged 6 commits into from
Feb 19, 2017
Merged

Use attrsOf in place of loaOf when relevant #20456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5b7975
acme module: certs option loaOf -> attrsOf
ericsagnes Nov 16, 2016
418901a
logcheck module: ignore, ignoreCron option loaOf -> attrsOf
ericsagnes Nov 16, 2016
2a9de91
tahoe module: introducers, nodes option loaOf -> attrsOf
ericsagnes Nov 16, 2016
b4d1d37
tinc module: networks, hosts option loaOf -> attrsOf
ericsagnes Nov 16, 2016
57c4d6f
znc module: networks option loaOf -> attrsOf
ericsagnes Nov 16, 2016
821e8d4
zope2 module: instance option loaOf -> attrsOf
ericsagnes Nov 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/security/acme.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ in

certs = mkOption {
default = { };
type = with types; loaOf (submodule certOpts);
type = with types; attrsOf (submodule certOpts);
description = ''
Attribute set of certificates to get signed and renewed.
'';
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/logging/logcheck.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ in
description = ''
This option defines extra ignore rules.
'';
type = with types; loaOf (submodule ignoreOptions);
type = with types; attrsOf (submodule ignoreOptions);
};

ignoreCron = mkOption {
default = {};
description = ''
This option defines extra ignore rules for cronjobs.
'';
type = with types; loaOf (submodule ignoreCronOptions);
type = with types; attrsOf (submodule ignoreCronOptions);
};

extraGroups = mkOption {
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/network-filesystems/tahoe.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ in
options.services.tahoe = {
introducers = mkOption {
default = {};
type = with types; loaOf (submodule {
type = with types; attrsOf (submodule {
options = {
nickname = mkOption {
type = types.str;
Expand Down Expand Up @@ -49,7 +49,7 @@ in
};
nodes = mkOption {
default = {};
type = with types; loaOf (submodule {
type = with types; attrsOf (submodule {
options = {
nickname = mkOption {
type = types.str;
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/networking/tinc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ in

networks = mkOption {
default = { };
type = with types; loaOf (submodule {
type = with types; attrsOf (submodule {
options = {

extraConfig = mkOption {
Expand Down Expand Up @@ -59,7 +59,7 @@ in

hosts = mkOption {
default = { };
type = types.loaOf types.lines;
type = types.attrsOf types.lines;
description = ''
The name of the host in the network as well as the configuration for that host.
This name should only contain alphanumerics and underscores.
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/znc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ in

networks = mkOption {
default = { };
type = with types; loaOf (submodule networkOpts);
type = with types; attrsOf (submodule networkOpts);
description = ''
IRC networks to connect the user to.
'';
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/web-servers/zope2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ in

services.zope2.instances = mkOption {
default = {};
type = with types; loaOf (submodule zope2Opts);
type = with types; attrsOf (submodule zope2Opts);
example = literalExample ''
{
plone01 = {
Expand Down