forked from zentralwerk/network
nix/lib/config/options: remove net-combined
This commit is contained in:
parent
125beb091d
commit
4e6dd9a4a1
|
@ -18,5 +18,4 @@ in
|
|||
# IP networks
|
||||
++ lib.filesystem.listFilesRecursive ./net;
|
||||
|
||||
site.net-combined = concatMapAttrsRecursive (name: value: { inherit (value) hosts4 hosts6; }) config.site.net;
|
||||
}
|
||||
|
|
|
@ -591,11 +591,6 @@ in
|
|||
type = with types; attrsOf (submodule netOpts);
|
||||
};
|
||||
|
||||
net-combined = mkOption {
|
||||
description = "All hosts of all subnets";
|
||||
default = {};
|
||||
type = with types; submodule netOpts;
|
||||
};
|
||||
|
||||
hosts = mkOption {
|
||||
description = "All the static hosts";
|
||||
|
|
|
@ -10,12 +10,11 @@ let
|
|||
nixpkgs.lib.generators.toPretty {} self.lib.openwrtModels
|
||||
);
|
||||
export-config = pkgs.writeText "config.nix" (
|
||||
nixpkgs.lib.generators.toPretty {} (lib.filterAttrsRecursive (n: v: n != "net-combined") (
|
||||
nixpkgs.lib.generators.toPretty {} (
|
||||
config
|
||||
//
|
||||
{ site.dns.localZones = self.lib.dns.localZones; }
|
||||
))
|
||||
);
|
||||
));
|
||||
|
||||
encrypt-secrets = pkgs.writeScriptBin "encrypt-secrets" ''
|
||||
#! ${pkgs.runtimeShell} -e
|
||||
|
|
Loading…
Reference in New Issue
Block a user