diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 812f190..16179b8 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -104,6 +104,10 @@ let inherit self nixpkgs system; }; + switch-report = import ./switch-report.nix { + inherit self nixpkgs system; + }; + vlan-report = import ./vlan-report.nix { inherit self nixpkgs system; }; @@ -115,6 +119,6 @@ in rootfs-packages // vm-packages // device-templates // openwrt-packages // network-graphs // network-cypher-graphs // starlink // subnetplans // { inherit export-openwrt-models export-config dns-slaves encrypt-secrets decrypt-secrets switch-to-production - homepage gateway-report vlan-report + homepage gateway-report switch-report vlan-report ; } diff --git a/nix/pkgs/gateway-report.nix b/nix/pkgs/gateway-report.nix index e9822b3..bc20d5d 100644 --- a/nix/pkgs/gateway-report.nix +++ b/nix/pkgs/gateway-report.nix @@ -4,7 +4,7 @@ let config = self.lib.config; in -writeText "vlan-report.md" '' +writeText "gateway-report.md" '' # Gateway Report ${lib.concatMapStrings (net: diff --git a/nix/pkgs/homepage/default.nix b/nix/pkgs/homepage/default.nix index d7b01db..8f6642a 100644 --- a/nix/pkgs/homepage/default.nix +++ b/nix/pkgs/homepage/default.nix @@ -12,7 +12,7 @@ let inherit (self.packages.${system}) export-config gateway-report network-graphs - subnetplans vlan-report; + subnetplans switch-report vlan-report; in stdenv.mkDerivation { @@ -30,8 +30,9 @@ stdenv.mkDerivation { pandoc -t html ${../../../doc/hello.md} > index.html cat ${./linked-data.html} >> index.html pandoc -t html ${../../../doc/vpn.md} > vpn.html - pandoc -t html ${vlan-report} > vlan-report.html pandoc -t html ${gateway-report} > gateway-report.html + pandoc -t html ${switch-report} > switch-report.html + pandoc -t html ${vlan-report} > vlan-report.html echo '
' > config.html bat --color=always --theme=GitHub -p ${export-config} | \ diff --git a/nix/pkgs/homepage/header.html b/nix/pkgs/homepage/header.html index b5f34a7..28ed7d2 100644 --- a/nix/pkgs/homepage/header.html +++ b/nix/pkgs/homepage/header.html @@ -25,6 +25,7 @@