Merge pull request #43094 from grahamc/fix-quagga-docs

quagga module: Use a deep merge via imports instead of the shallow merge
This commit is contained in:
Graham Christensen 2018-07-06 17:47:05 -04:00 committed by GitHub
commit 96305ca6f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -95,12 +95,10 @@ in
{
###### interface
options.services.quagga =
imports = [
{
options.services.quagga = {
zebra = (serviceOptions "zebra") // {
enable = mkOption {
type = types.bool;
default = any isEnabled services;
@ -111,10 +109,11 @@ in
if any routing protocols are configured.
'';
};
};
} // (genAttrs services serviceOptions);
};
}
{ options.services.quagga = (genAttrs services serviceOptions); }
];
###### implementation