public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logcheck module: optionSet -> submodule

Browse Source
This commit is contained in:
Eric Sagnes 2016-09-11 16:46:00 +09:00
parent 495a24d912
commit c1cad56c6e
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/logging/logcheck.nix
View File

@ -62,6 +62,7 @@ let
}; };
ignoreOptions = { ignoreOptions = {
options = {
level = levelOption; level = levelOption;
regex = mkOption { regex = mkOption {
@ -72,8 +73,10 @@ let
''; '';
}; };
}; };
};
ignoreCronOptions = { ignoreCronOptions = {
options = {
user = mkOption { user = mkOption {
default = "root"; default = "root";
type = types.str; type = types.str;
@ -100,6 +103,7 @@ let
''; '';
}; };
}; };
};
in in
{ {
@ -180,8 +184,7 @@ in
description = '' description = ''
This option defines extra ignore rules. This option defines extra ignore rules.
''; '';
type = types.loaOf types.optionSet; type = with types; loaOf (submodule ignoreOptions);
options = [ ignoreOptions ];
}; };
ignoreCron = mkOption { ignoreCron = mkOption {
@ -189,8 +192,7 @@ in
description = '' description = ''
This option defines extra ignore rules for cronjobs. This option defines extra ignore rules for cronjobs.
''; '';
type = types.loaOf types.optionSet; type = with types; loaOf (submodule ignoreCronOptions);
options = [ ignoreOptions ignoreCronOptions ];
}; };
extraGroups = mkOption { extraGroups = mkOption {