From accf643294f77744269ad8c812d93956b1faa672 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 16 Dec 2024 09:34:26 +0100 Subject: [PATCH] chore(meta): Remove nodes.nix --- .forgejo/workflows/eval-nodes.yaml | 22 ++-- meta/nodes.nix | 201 ----------------------------- meta/nodes/nixos.nix | 16 +-- workflows/eval-nodes.nix | 2 +- 4 files changed, 20 insertions(+), 221 deletions(-) delete mode 100644 meta/nodes.nix diff --git a/.forgejo/workflows/eval-nodes.yaml b/.forgejo/workflows/eval-nodes.yaml index 1453469..3923765 100644 --- a/.forgejo/workflows/eval-nodes.yaml +++ b/.forgejo/workflows/eval-nodes.yaml @@ -1,15 +1,4 @@ jobs: - netcore02: - runs-on: nix - steps: - - uses: actions/checkout@v3 - - env: - BUILD_NODE: netcore02 - STORE_ENDPOINT: https://tvix-store.dgnum.eu/infra-signing/ - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - STORE_USER: admin - name: Build and cache netcore02 - run: nix-shell -A eval-nodes --run cache-node ap01: runs-on: nix steps: @@ -65,6 +54,17 @@ jobs: STORE_USER: admin name: Build and cache geo02 run: nix-shell -A eval-nodes --run cache-node + netcore02: + runs-on: nix + steps: + - uses: actions/checkout@v3 + - env: + BUILD_NODE: netcore02 + STORE_ENDPOINT: https://tvix-store.dgnum.eu/infra-signing/ + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + STORE_USER: admin + name: Build and cache netcore02 + run: nix-shell -A eval-nodes --run cache-node rescue01: runs-on: nix steps: diff --git a/meta/nodes.nix b/meta/nodes.nix deleted file mode 100644 index ee5c3f1..0000000 --- a/meta/nodes.nix +++ /dev/null @@ -1,201 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Tom Hubrecht -# SPDX-FileContributor: Julien Malka -# SPDX-FileContributor: Maurice Debray -# SPDX-FileContributor: Ryan Lahfa -# -# SPDX-License-Identifier: EUPL-1.2 - -### -# File specifying all the deployement options for the nodes administrated by the dgnum. -# -# Node metadata template is: -# -# NODE_NAME = { -# adminGroups = []; # List of groups that have root access -# admins = []; # List of individuals that have root access -# deployment = {}; # Colmena deployment options -# nixpkgs = "unstable" or "22.11"; # nixpkgs version -# } - -/* - Liste des différents sites : - - rat01 -> VM du NPSPI - - pav01 -> Salle serveur sous le pavillon Pasteur - - oik01 -> Local DGNum Jourdan - - hyp01 -> Salle serveur Hypnos 1 - - luj01 -> VM de Luj -*/ -{ - bridge01 = { - site = "hyp01"; - - hashedPassword = "$y$j9T$EPJdz70kselouXAVUmAH01$8nYbUBY9NPTMfYigegY0qFSdxJwhqzW8sFacDqEYCP5"; - - stateVersion = "24.05"; - - adminGroups = [ "fai" ]; - - deployment = { - targetHost = "fd26:baf9:d250:8000::ffff"; - sshOptions = [ - "-J" - "root@vault01.hyp01.infra.dgnum.eu" - ]; - }; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - compute01 = { - site = "pav01"; - - hashedPassword = "$y$j9T$2nxZHq84G7fWvWMEaGavE/$0ADnmD9qMpXJJ.rWWH9086EakvZ3wAg0mSxZYugOf3C"; - - stateVersion = "23.05"; - nix-modules = [ "services/stirling-pdf" ]; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - geo01 = { - site = "oik01"; - deployment.tags = [ "geo" ]; - - hashedPassword = "$y$j9T$2XmDpJu.QLhV57yYCh5Lf1$LK.X0HKB02Q0Ujvhj5nIofW2IRrIAL/Uxnvl9AXM1L8"; - - stateVersion = "24.05"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - geo02 = { - site = "oik01"; - deployment.tags = [ "geo" ]; - - hashedPassword = "$y$j9T$Q4fbMpSm9beWu4DPNAR9t0$dx/1pH4GPY72LpS5ZiECXAZFDdxwmIywztsX.qo2VVA"; - - stateVersion = "24.05"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - rescue01 = { - site = "luj01"; - - deployment.targetHost = "v6.rescue01.luj01.infra.dgnum.eu"; - - hashedPassword = "$y$j9T$nqoMMu/axrD0m8AlUFdbs.$UFVmIdPAOHBe2jJv5HJJTcDgINC7LTnSGRQNs9zS1mC"; - - stateVersion = "23.11"; - vm-cluster = "Hyperviseur Luj"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - storage01 = { - site = "pav01"; - - hashedPassword = "$y$j9T$tvRu1EJ9MwDSvEm0ogwe70$bKSw6nNteN0L3NOy2Yix7KlIvO/oROQmQ.Ynq002Fg8"; - - stateVersion = "23.11"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - - nix-modules = [ - "services/forgejo-nix-runners" - "services/netbird/server.nix" - ]; - }; - - vault01 = { - site = "hyp01"; - deployment.targetHost = "vault01.hyp01.infra.dgnum.eu"; - - hashedPassword = "$y$j9T$5osXVNxCDxu3jIndcyh7G.$UrjiDRpMu3W59tKHLGNdLWllZh.4p8IM4sBS5SrNrN1"; - - stateVersion = "23.11"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - - adminGroups = [ "fai" ]; - }; - - web01 = { - site = "rat01"; - - deployment.tags = [ "web" ]; - - hashedPassword = "$y$j9T$9YqXO93VJE/GP3z8Sh4h51$hrBsEPL2O1eP/wBZTrNT8XV906V4JKbQ0g04IWBcyd2"; - - stateVersion = "23.05"; - vm-cluster = "Hyperviseur NPS"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - web02 = { - site = "rat01"; - - hashedPassword = "$y$j9T$p42UVNy78PykkQOjPwXNJ/$B/zCUOrHXVSFGUY63wnViMiSmU2vCWsiX0y62qqgNQ5"; - - stateVersion = "24.05"; - vm-cluster = "Hyperviseur NPS"; - - nixpkgs = { - version = "24.05"; - system = "nixos"; - }; - }; - - web03 = { - site = "rat01"; - - hashedPassword = "$y$j9T$Un/tcX5SPKNXG.sy/BcTa.$kyNHELjb1GAOWnauJfcjyVi5tacWcuEBKflZDCUC6x4"; - - stateVersion = "24.05"; - vm-cluster = "Hyperviseur NPS"; - - nixpkgs = { - version = "24.11"; - system = "nixos"; - }; - }; - - ap01 = { - site = "unknown"; - adminGroups = [ "fai" ]; - - hashedPassword = "$y$j9T$DMOQEWOYFHjNS0myrXp4x/$MG33VSdXGvib.99eN.AbvyVdNNJw4ERjAwK4.ULJe/A"; - - stateVersion = null; - - nixpkgs = { - system = "zyxel-nwa50ax"; - version = "24.05"; - }; - }; -} diff --git a/meta/nodes/nixos.nix b/meta/nodes/nixos.nix index 4812329..34e5f62 100644 --- a/meta/nodes/nixos.nix +++ b/meta/nodes/nixos.nix @@ -44,7 +44,7 @@ }; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; @@ -58,7 +58,7 @@ nix-modules = [ "services/stirling-pdf" ]; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; @@ -72,7 +72,7 @@ stateVersion = "24.05"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; @@ -86,7 +86,7 @@ stateVersion = "24.05"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; @@ -102,7 +102,7 @@ vm-cluster = "Hyperviseur Luj"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; @@ -115,7 +115,7 @@ stateVersion = "23.11"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; @@ -134,7 +134,7 @@ stateVersion = "23.11"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; @@ -152,7 +152,7 @@ vm-cluster = "Hyperviseur NPS"; nixpkgs = { - version = "24.05"; + version = "24.11"; system = "nixos"; }; }; diff --git a/workflows/eval-nodes.nix b/workflows/eval-nodes.nix index 6f4c10a..d8974ab 100644 --- a/workflows/eval-nodes.nix +++ b/workflows/eval-nodes.nix @@ -7,7 +7,7 @@ let inherit (lib) attrNames genAttrs; - nodes = attrNames (import ../meta/nodes.nix); + nodes = attrNames (import ../meta/nodes); in {