Remove unused require.
svn path=/nixos/branches/modular-nixos/; revision=15677
This commit is contained in:
parent
72e4b7e18d
commit
91387275ee
|
@ -1,49 +1,47 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mergeOneOption mkOption mkIf;
|
||||
in
|
||||
|
||||
{
|
||||
require = [
|
||||
{
|
||||
security = {
|
||||
setuidPrograms = mkOption {
|
||||
default = [
|
||||
"passwd" "su" "crontab" "ping" "ping6"
|
||||
"fusermount" "wodim" "cdrdao" "growisofs"
|
||||
];
|
||||
description = "
|
||||
Only the programs from system path listed her will be made setuid root
|
||||
(through a wrapper program). It's better to set
|
||||
<option>security.extraSetuidPrograms</option>.
|
||||
";
|
||||
};
|
||||
security = {
|
||||
setuidPrograms = mkOption {
|
||||
default = [
|
||||
"passwd" "su" "crontab" "ping" "ping6"
|
||||
"fusermount" "wodim" "cdrdao" "growisofs"
|
||||
];
|
||||
description = "
|
||||
Only the programs from system path listed her will be made setuid root
|
||||
(through a wrapper program). It's better to set
|
||||
<option>security.extraSetuidPrograms</option>.
|
||||
";
|
||||
};
|
||||
|
||||
extraSetuidPrograms = mkOption {
|
||||
default = [];
|
||||
example = ["fusermount"];
|
||||
description = "
|
||||
This option lists additional programs that must be made setuid
|
||||
root.
|
||||
";
|
||||
};
|
||||
extraSetuidPrograms = mkOption {
|
||||
default = [];
|
||||
example = ["fusermount"];
|
||||
description = "
|
||||
This option lists additional programs that must be made setuid
|
||||
root.
|
||||
";
|
||||
};
|
||||
|
||||
setuidOwners = mkOption {
|
||||
default = [];
|
||||
example = [{
|
||||
program = "sendmail";
|
||||
owner = "nodody";
|
||||
group = "postdrop";
|
||||
setuid = false;
|
||||
setgid = true;
|
||||
}];
|
||||
description = ''
|
||||
List of non-trivial setuid programs from system path, like Postfix sendmail. Default
|
||||
should probably be nobody:nogroup:false:false - if you are bothering
|
||||
doing anything with a setuid program, "root.root u+s g-s" is not what
|
||||
you are aiming at..
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
setuidOwners = mkOption {
|
||||
default = [];
|
||||
example = [{
|
||||
program = "sendmail";
|
||||
owner = "nodody";
|
||||
group = "postdrop";
|
||||
setuid = false;
|
||||
setgid = true;
|
||||
}];
|
||||
description = ''
|
||||
List of non-trivial setuid programs from system path, like Postfix sendmail. Default
|
||||
should probably be nobody:nogroup:false:false - if you are bothering
|
||||
doing anything with a setuid program, "root.root u+s g-s" is not what
|
||||
you are aiming at..
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue