pkgs/device-templates: exclude all ap* from all-device-scripts
This commit is contained in:
parent
469caa0858
commit
10b8faeb23
|
@ -75,7 +75,7 @@
|
||||||
"all-device-scripts" = hydraJob;
|
"all-device-scripts" = hydraJob;
|
||||||
"export-config" = exportFileWrapper;
|
"export-config" = exportFileWrapper;
|
||||||
"switch-.*" = exportFileWrapper;
|
"switch-.*" = exportFileWrapper;
|
||||||
"ap.*" = exportFileWrapper;
|
"ap.*-image" = exportFileWrapper;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
builtins.mapAttrs (name: pkg:
|
builtins.mapAttrs (name: pkg:
|
||||||
|
|
|
@ -71,7 +71,10 @@ let
|
||||||
|
|
||||||
openwrt = import ./openwrt { inherit self nixpkgs system openwrt-imagebuilder; };
|
openwrt = import ./openwrt { inherit self nixpkgs system openwrt-imagebuilder; };
|
||||||
|
|
||||||
openwrt-images = builtins.foldl' (images: hostName: images // {
|
openwrt-packages = builtins.foldl' (images: hostName: images // {
|
||||||
|
${hostName} = pkgs.writeScriptBin "${hostName}.sh" (
|
||||||
|
openwrt.sshScript hostName
|
||||||
|
);
|
||||||
"${hostName}-image" = openwrt.buildImage hostName;
|
"${hostName}-image" = openwrt.buildImage hostName;
|
||||||
}) {} (
|
}) {} (
|
||||||
builtins.attrNames (
|
builtins.attrNames (
|
||||||
|
@ -101,7 +104,7 @@ let
|
||||||
inherit self nixpkgs system;
|
inherit self nixpkgs system;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
rootfs-packages // vm-packages // device-templates // openwrt-images // network-graphs // network-cypher-graphs // starlink // subnetplans // {
|
rootfs-packages // vm-packages // device-templates // openwrt-packages // network-graphs // network-cypher-graphs // starlink // subnetplans // {
|
||||||
inherit export-openwrt-models export-config dns-slaves
|
inherit export-openwrt-models export-config dns-slaves
|
||||||
encrypt-secrets decrypt-secrets switch-to-production
|
encrypt-secrets decrypt-secrets switch-to-production
|
||||||
vlan-report
|
vlan-report
|
||||||
|
|
|
@ -11,18 +11,13 @@ let
|
||||||
args = {
|
args = {
|
||||||
inherit self hostName config hostConfig pkgs;
|
inherit self hostName config hostConfig pkgs;
|
||||||
};
|
};
|
||||||
in {
|
in import (./switches + "/${model}.nix") (
|
||||||
ap = openwrt.sshScript hostName;
|
args // import ./switches/shared.nix args
|
||||||
switch = import (./switches + "/${model}.nix")
|
)
|
||||||
(args //
|
|
||||||
import ./switches/shared.nix args
|
|
||||||
);
|
|
||||||
}.${role}
|
|
||||||
)
|
)
|
||||||
) (
|
) (
|
||||||
filterAttrs (_: { role, model, ... }:
|
filterAttrs (_: { role, model, ... }:
|
||||||
role == "ap" ||
|
role == "switch" && model != "dumb"
|
||||||
(role == "switch" && model != "dumb")
|
|
||||||
) config.site.hosts
|
) config.site.hosts
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue