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
+15 -16
View File
@@ -95,26 +95,25 @@ in
{ {
###### interface ###### interface
imports = [
options.services.quagga =
{ {
options.services.quagga = {
zebra = (serviceOptions "zebra") // {
enable = mkOption {
type = types.bool;
default = any isEnabled services;
description = ''
Whether to enable the Zebra routing manager.
zebra = (serviceOptions "zebra") // { The Zebra routing manager is automatically enabled
if any routing protocols are configured.
enable = mkOption { '';
type = types.bool; };
default = any isEnabled services;
description = ''
Whether to enable the Zebra routing manager.
The Zebra routing manager is automatically enabled
if any routing protocols are configured.
'';
}; };
}; };
}
} // (genAttrs services serviceOptions); { options.services.quagga = (genAttrs services serviceOptions); }
];
###### implementation ###### implementation