From e10e22df4be8752d87ea3b387a1ed8264e42b4ea Mon Sep 17 00:00:00 2001 From: Lzebulon Date: Tue, 21 Jul 2026 15:40:54 +0200 Subject: [PATCH] start integration of a info.nix --- flake.nix | 167 ++++++++++++++++++++---------- hosts/physiques/thot/default.nix | 14 --- hosts/physiques/thot/info.nix | 17 +++ hosts/vm/apprentix/default.nix | 15 --- hosts/vm/apprentix/info.nix | 17 +++ hosts/vm/collabora/default.nix | 11 -- hosts/vm/collabora/info.nix | 14 +++ hosts/vm/jitsi/default.nix | 18 ---- hosts/vm/jitsi/info.nix | 26 +++++ hosts/vm/livre/default.nix | 11 -- hosts/vm/livre/info.nix | 14 +++ hosts/vm/neo/default.nix | 19 ---- hosts/vm/neo/info.nix | 20 ++++ hosts/vm/nextcloud/default.nix | 19 ---- hosts/vm/nextcloud/info.nix | 22 ++++ hosts/vm/periodique/default.nix | 11 -- hosts/vm/periodique/info.nix | 14 +++ hosts/vm/redite/default.nix | 11 -- hosts/vm/redite/info.nix | 13 +++ hosts/vm/reverseproxy/default.nix | 17 --- hosts/vm/reverseproxy/info.nix | 20 ++++ hosts/vm/two/default.nix | 13 --- hosts/vm/two/info.nix | 16 +++ hosts/vm/vaultwarden/default.nix | 11 -- hosts/vm/vaultwarden/info.nix | 13 +++ modules/crans/default.nix | 1 + modules/crans/extra.nix | 32 ++++++ modules/crans/networking.nix | 18 ++-- modules/crans/remote_builder.nix | 18 ++++ 29 files changed, 375 insertions(+), 237 deletions(-) create mode 100644 hosts/physiques/thot/info.nix create mode 100644 hosts/vm/apprentix/info.nix create mode 100644 hosts/vm/collabora/info.nix create mode 100644 hosts/vm/jitsi/info.nix create mode 100644 hosts/vm/livre/info.nix create mode 100644 hosts/vm/neo/info.nix create mode 100644 hosts/vm/nextcloud/info.nix create mode 100644 hosts/vm/periodique/info.nix create mode 100644 hosts/vm/redite/info.nix create mode 100644 hosts/vm/reverseproxy/info.nix create mode 100644 hosts/vm/two/info.nix create mode 100644 hosts/vm/vaultwarden/info.nix create mode 100644 modules/crans/extra.nix create mode 100644 modules/crans/remote_builder.nix diff --git a/flake.nix b/flake.nix index 757108a..e15ed12 100644 --- a/flake.nix +++ b/flake.nix @@ -38,75 +38,130 @@ ./modules agenix.nixosModules.default ]; + get_hosts_names = path: + attrNames ( + attrsets.filterAttrs (name: type: type == "directory") + (readDir path) + ) ; + hostVM = get_hosts_names ./hosts/vm; + hostPhysique = get_hosts_names ./hosts/physiques; + get_info = + path: lists: + filter (x: x != null) + (map (name: + let filePath = path + "/${name}/info.nix"; + in + if builtins.pathExists filePath then + # let eval = evalModules { + # modules = [ + # # ./modules/crans + # { + # crans = import filePath; + # } + # agenix.nixosModules.default + # ]; + # }; + # in + # eval.config + { + crans = import filePath; + } + else + warn "${toString filePath} not found" null + ) lists + ); + hosts_vm_info = get_info ./hosts/vm hostVM; + hosts_physique_info = get_info ./hosts/physiques hostPhysique; + + listInfoToAttrs = + path: infos: + listToAttrs ( + map (info: + { + name = info.crans.name; + value = + nixosSystem { + specialArgs = inputs; + modules = [(path + "/${info.crans.name}")] ++ [info] ++ baseModules + ; + }; + } + ) infos) + ; + attrs_vm_info = listInfoToAttrs ./hosts/vm hosts_vm_info; + attrs_physique_info = listInfoToAttrs ./hosts/physiques hosts_physique_info; + attrs_all_info = attrs_physique_info // attrs_vm_info; in + attrs_all_info + // { - apprentix = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/apprentix ] ++ baseModules; - }; + # apprentix = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/apprentix ] ++ baseModules; + # }; - collabora = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/collabora ] ++ baseModules; - }; + # collabora = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/collabora ] ++ baseModules; + # }; - jitsi = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/jitsi ] ++ baseModules; - }; + # jitsi = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/jitsi ] ++ baseModules; + # }; - livre = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/livre ] ++ baseModules; - }; + # livre = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/livre ] ++ baseModules; + # }; - neo = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/neo ] ++ baseModules; - }; + # neo = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/neo ] ++ baseModules; + # }; - nextcloud = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/nextcloud ] ++ baseModules; - }; + # nextcloud = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/nextcloud ] ++ baseModules; + # }; - periodique = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/periodique ] ++ baseModules; - }; + # periodique = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/periodique ] ++ baseModules; + # }; - redite = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/redite ] ++ baseModules; - }; + # redite = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/redite ] ++ baseModules; + # }; - reverseproxy = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/reverseproxy ] ++ baseModules; - }; + # reverseproxy = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/reverseproxy ] ++ baseModules; + # }; - thot = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/physiques/thot ] ++ baseModules; - }; + # thot = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/physiques/thot ] ++ baseModules; + # }; - two = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/two ] ++ baseModules; - }; + # two = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/two ] ++ baseModules; + # }; - vaultwarden = nixosSystem { - specialArgs = inputs; - modules = [ ./hosts/vm/vaultwarden ] ++ baseModules; - }; - cransIso = nixosSystem { - system = "x86_64-linux"; - specialArgs = inputs; - modules = [ - ./hosts/iso - ./modules/crans/locale.nix - ]; - }; + # vaultwarden = nixosSystem { + # specialArgs = inputs; + # modules = [ ./hosts/vm/vaultwarden ] ++ baseModules; + # }; + # cransIso = nixosSystem { + # system = "x86_64-linux"; + # specialArgs = inputs; + # modules = [ + # ./hosts/iso + # ./modules/crans/locale.nix + # ]; + # }; }; }; diff --git a/hosts/physiques/thot/default.nix b/hosts/physiques/thot/default.nix index 80d4f99..27f44b4 100644 --- a/hosts/physiques/thot/default.nix +++ b/hosts/physiques/thot/default.nix @@ -38,19 +38,5 @@ restic ]; - crans = { - enable = true; - - networking.adm.enable = false; - resticClient.enable = false; - - services = { - resticServer = { - enable = true; - port = 4242; - }; - }; - }; - system.stateVersion = "24.05"; } diff --git a/hosts/physiques/thot/info.nix b/hosts/physiques/thot/info.nix new file mode 100644 index 0000000..e45b6db --- /dev/null +++ b/hosts/physiques/thot/info.nix @@ -0,0 +1,17 @@ +{ + name = "thot"; + description = "Serveur de backup sous nixos utilisant Restic"; + id = 14; + + enable = true; + + networking.adm.enable = false; + resticClient.enable = false; + + services = { + resticServer = { + enable = true; + port = 4242; + }; + }; +} diff --git a/hosts/vm/apprentix/default.nix b/hosts/vm/apprentix/default.nix index 4e67e57..1525c72 100644 --- a/hosts/vm/apprentix/default.nix +++ b/hosts/vm/apprentix/default.nix @@ -9,21 +9,6 @@ networking.hostName = "apprentix"; - crans = { - enable = true; - - networking = { - id = 150; - srvNat.enable = true; - }; - - resticClient.when = "01:23"; - - homeNounou.enable = false; - - users.root.passwordFile = ../../../secrets/apprentix/root.age; - }; - security.sudo.extraRules = [ { groups = [ "_user" ]; diff --git a/hosts/vm/apprentix/info.nix b/hosts/vm/apprentix/info.nix new file mode 100644 index 0000000..22e47f2 --- /dev/null +++ b/hosts/vm/apprentix/info.nix @@ -0,0 +1,17 @@ +{ + name = "apprentix"; + description = "VM pour les apprenti⋅es"; + id = 150; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.when = "01:23"; + + homeNounou.enable = false; + + users.root.passwordFile = ../../../secrets/apprentix/root.age; +} diff --git a/hosts/vm/collabora/default.nix b/hosts/vm/collabora/default.nix index 46fbc66..4d0a67f 100644 --- a/hosts/vm/collabora/default.nix +++ b/hosts/vm/collabora/default.nix @@ -9,16 +9,5 @@ networking.hostName = "collabora"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 149; - srvNat.enable = true; - }; - - resticClient.enable = false; - }; - system.stateVersion = "25.09"; } diff --git a/hosts/vm/collabora/info.nix b/hosts/vm/collabora/info.nix new file mode 100644 index 0000000..85052e9 --- /dev/null +++ b/hosts/vm/collabora/info.nix @@ -0,0 +1,14 @@ +{ + name = "collabora"; + description = "Collabora du Crans"; + id = 149; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.enable = false; +} + diff --git a/hosts/vm/jitsi/default.nix b/hosts/vm/jitsi/default.nix index 518a948..120bd48 100644 --- a/hosts/vm/jitsi/default.nix +++ b/hosts/vm/jitsi/default.nix @@ -9,23 +9,5 @@ networking.hostName = "jitsi"; boot.loader.grub.devices = [ "/dev/vda" ]; - crans = { - enable = true; - - networking = { - id = 163; - srv = { - enable = true; - ipv4 = "185.230.79.15"; - }; - }; - - resticClient.when = "02:34"; - - services = { - acme.enable = true; - }; - }; - system.stateVersion = "24.11"; } diff --git a/hosts/vm/jitsi/info.nix b/hosts/vm/jitsi/info.nix new file mode 100644 index 0000000..64e9044 --- /dev/null +++ b/hosts/vm/jitsi/info.nix @@ -0,0 +1,26 @@ +{ + name = "jitsi"; + description = "Machine qui gère Jitsi"; + + id = 163; + + networking = { + srv = { + enable = true; + ipv4 = "185.230.79.15"; + }; + }; + + resticClient.when = "02:34"; + + services = { + acme.enable = true; + }; + + # aliasDNS = [ + # "visio" + # ]; + + public-ssh = ""; + +} diff --git a/hosts/vm/livre/default.nix b/hosts/vm/livre/default.nix index 9b669a9..1a76e79 100644 --- a/hosts/vm/livre/default.nix +++ b/hosts/vm/livre/default.nix @@ -9,16 +9,5 @@ networking.hostName = "livre"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 140; - srvNat.enable = true; - }; - - resticClient.when = "03:45"; - }; - system.stateVersion = "24.11"; } diff --git a/hosts/vm/livre/info.nix b/hosts/vm/livre/info.nix new file mode 100644 index 0000000..7eba0c0 --- /dev/null +++ b/hosts/vm/livre/info.nix @@ -0,0 +1,14 @@ +{ + name = "livre"; + description = "Editeur de PDF en ligne via Stirling-PDF"; + id = 140; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.when = "03:45"; +} + diff --git a/hosts/vm/neo/default.nix b/hosts/vm/neo/default.nix index f2f99ae..c5aaf5f 100644 --- a/hosts/vm/neo/default.nix +++ b/hosts/vm/neo/default.nix @@ -12,24 +12,5 @@ networking.hostName = "neo"; - crans = { - enable = true; - - networking = { - id = 141; - srv = { - enable = true; - ipv4 = "185.230.79.5"; - }; - }; - - resticClient.when = "04:56"; - - services = { - acme.enable = true; - coturn.enable = true; - }; - }; - system.stateVersion = "24.11"; } diff --git a/hosts/vm/neo/info.nix b/hosts/vm/neo/info.nix new file mode 100644 index 0000000..e234b09 --- /dev/null +++ b/hosts/vm/neo/info.nix @@ -0,0 +1,20 @@ +{ + name = "neo"; + description = "Matrix du Crans et bridge IRC/Matrix"; + enable = true; + id = 141; + + networking = { + srv = { + enable = true; + ipv4 = "185.230.79.5"; + }; + }; + + resticClient.when = "04:56"; + + services = { + acme.enable = true; + coturn.enable = true; + }; +} diff --git a/hosts/vm/nextcloud/default.nix b/hosts/vm/nextcloud/default.nix index 99c1ae6..4c96991 100644 --- a/hosts/vm/nextcloud/default.nix +++ b/hosts/vm/nextcloud/default.nix @@ -9,25 +9,6 @@ networking.hostName = "nextcloud"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - networking = { - id = 146; - srvNat = { - enable = true; - interface = "ens20"; - }; - san = { - enable = true; - interface = "ens19"; - }; - }; - - homeAdh.enable = true; - - resticClient.enable = false; - }; - services.autofs = { enable = true; diff --git a/hosts/vm/nextcloud/info.nix b/hosts/vm/nextcloud/info.nix new file mode 100644 index 0000000..d23079d --- /dev/null +++ b/hosts/vm/nextcloud/info.nix @@ -0,0 +1,22 @@ +{ + name = "nextcloud"; + description = "Nextcloud du Crans"; + id = 146; + + enable = true; + + networking = { + srvNat = { + enable = true; + interface = "ens20"; + }; + san = { + enable = true; + interface = "ens19"; + }; + }; + + homeAdh.enable = true; + + resticClient.enable = false; +} diff --git a/hosts/vm/periodique/default.nix b/hosts/vm/periodique/default.nix index d66df0b..82cd023 100644 --- a/hosts/vm/periodique/default.nix +++ b/hosts/vm/periodique/default.nix @@ -9,16 +9,5 @@ networking.hostName = "periodique"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 118; - srvNat.enable = true; - }; - - resticClient.when = "02:56"; - }; - system.stateVersion = "24.11"; } diff --git a/hosts/vm/periodique/info.nix b/hosts/vm/periodique/info.nix new file mode 100644 index 0000000..faf99e8 --- /dev/null +++ b/hosts/vm/periodique/info.nix @@ -0,0 +1,14 @@ +{ + name = "periodique"; + description = "Frontend Matrix du Crans (element)"; + id = 118; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.when = "02:56"; +} + diff --git a/hosts/vm/redite/default.nix b/hosts/vm/redite/default.nix index 45dea89..e80b4e7 100644 --- a/hosts/vm/redite/default.nix +++ b/hosts/vm/redite/default.nix @@ -9,16 +9,5 @@ networking.hostName = "redite"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 139; - srvNat.enable = true; - }; - - resticClient.when = "06:18"; - }; - system.stateVersion = "23.11"; } diff --git a/hosts/vm/redite/info.nix b/hosts/vm/redite/info.nix new file mode 100644 index 0000000..78094da --- /dev/null +++ b/hosts/vm/redite/info.nix @@ -0,0 +1,13 @@ +{ + name = "redite"; + description = "Frontend reddit libre"; + id = 139; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.when = "06:18"; +} diff --git a/hosts/vm/reverseproxy/default.nix b/hosts/vm/reverseproxy/default.nix index 4c56498..c4e0f27 100644 --- a/hosts/vm/reverseproxy/default.nix +++ b/hosts/vm/reverseproxy/default.nix @@ -13,22 +13,5 @@ users.users."nginx".home = "/var/lib/nginx"; users.users."anubis".extraGroups = [ "nginx" ]; - crans = { - enable = true; - - networking = { - id = 151; - srvNat.enable = true; - srv = { - enable = true; - interface = "ens20"; - ipv4 = "185.230.79.42"; - }; - }; - - resticClient.when = "03:42"; - - }; - system.stateVersion = "25.05"; } diff --git a/hosts/vm/reverseproxy/info.nix b/hosts/vm/reverseproxy/info.nix new file mode 100644 index 0000000..4481c49 --- /dev/null +++ b/hosts/vm/reverseproxy/info.nix @@ -0,0 +1,20 @@ +{ + name = "reverseproxy"; + description = "reverse-proxy principale du Crans"; + id = 151; + + enable = true; + + networking = { + srvNat.enable = true; + srv = { + enable = true; + interface = "ens20"; + ipv4 = "185.230.79.42"; + }; + }; + + resticClient.when = "03:42"; + +} + diff --git a/hosts/vm/two/default.nix b/hosts/vm/two/default.nix index a87ebcd..0a71c71 100644 --- a/hosts/vm/two/default.nix +++ b/hosts/vm/two/default.nix @@ -8,19 +8,6 @@ networking.hostName = "two"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 135; - srvNat = { - enable = true; - interface = "ens19"; - }; - }; - - resticClient.when = "07:29"; - }; system.stateVersion = "23.11"; } diff --git a/hosts/vm/two/info.nix b/hosts/vm/two/info.nix new file mode 100644 index 0000000..2b833b5 --- /dev/null +++ b/hosts/vm/two/info.nix @@ -0,0 +1,16 @@ +{ + name = "two"; + description = "VM de test"; + id = 135; + + enable = true; + + networking = { + srvNat = { + enable = true; + interface = "ens19"; + }; + }; + + resticClient.when = "07:29"; +} diff --git a/hosts/vm/vaultwarden/default.nix b/hosts/vm/vaultwarden/default.nix index 523b73d..d98caf8 100644 --- a/hosts/vm/vaultwarden/default.nix +++ b/hosts/vm/vaultwarden/default.nix @@ -9,16 +9,5 @@ networking.hostName = "vaultwarden"; boot.loader.grub.devices = [ "/dev/sda" ]; - crans = { - enable = true; - - networking = { - id = 159; - srvNat.enable = true; - }; - - resticClient.when = "04:44"; - }; - system.stateVersion = "24.05"; } diff --git a/hosts/vm/vaultwarden/info.nix b/hosts/vm/vaultwarden/info.nix new file mode 100644 index 0000000..953a611 --- /dev/null +++ b/hosts/vm/vaultwarden/info.nix @@ -0,0 +1,13 @@ +{ + name = "vaultwarden"; + description = "Vaultarden du crans, gestionnaire de mot de passe"; + id = 159; + + enable = true; + + networking = { + srvNat.enable = true; + }; + + resticClient.when = "04:44"; +} diff --git a/modules/crans/default.nix b/modules/crans/default.nix index cf9f2ea..ff29544 100644 --- a/modules/crans/default.nix +++ b/modules/crans/default.nix @@ -8,6 +8,7 @@ in { imports = [ ./age.nix + ./extra.nix ./grub.nix ./home.nix ./locale.nix diff --git a/modules/crans/extra.nix b/modules/crans/extra.nix new file mode 100644 index 0000000..e782292 --- /dev/null +++ b/modules/crans/extra.nix @@ -0,0 +1,32 @@ +{ lib, ... }: +with lib; +{ + options.crans = { + name = mkOption { + type = types.str; + example = "vm-test"; + description = "Nom de la machine"; + }; + + description = mkOption { + type = types.str; + example = "VM de test"; + description = "Description de la machine"; + }; + + id = mkOption { + type = types.int; + example = 135; + description = """ + ID de la machine : + - < 100 machine physique + - >= 100 VM ( id de la VM dans proxmox ) + """; + }; + + public-ssh = mkOption { + type = types.str; + description = "Clé ssh public de la machine"; + }; + }; +} diff --git a/modules/crans/networking.nix b/modules/crans/networking.nix index 60ac51e..ca220d3 100644 --- a/modules/crans/networking.nix +++ b/modules/crans/networking.nix @@ -1,7 +1,8 @@ { lib, config, ... }: let - cfg = config.crans.networking; + cfg = config.crans; + cfg-net = cfg.networking; inherit (lib) mkEnableOption @@ -20,12 +21,6 @@ in options.crans.networking = { enable = mkEnableOption "Configuration réseaux commune à toutes les machines du Crans."; - id = mkOption { - type = types.int; - example = 135; - description = "Le numéro de la VM dans Proxmox."; - }; - adm = { enable = mkEnableOption "Configuration du VLAN adm."; @@ -76,8 +71,9 @@ in }; }; - config = mkIf cfg.enable { + config = mkIf cfg-net.enable { networking = { + hostName = cfg.name; useDHCP = false; firewall.enable = lib.mkDefault false; nameservers = [ "172.16.10.128" ]; @@ -92,12 +88,12 @@ in # plus bas). lib.attrsets.mapAttrs' (interface: conf: { - name = cfg."${interface}".interface; + name = cfg-net."${interface}".interface; value = conf; }) ( # On filtre sur les interfaces activées - lib.attrsets.filterAttrs (interface: _: cfg."${interface}".enable) { + lib.attrsets.filterAttrs (interface: _: cfg-net."${interface}".enable) { # Configuration du VLAN adm adm = { ipv4.addresses = [ @@ -120,7 +116,7 @@ in ipv4 = { addresses = [ { - address = cfg.srv.ipv4; + address = cfg-net.srv.ipv4; prefixLength = 26; } ]; diff --git a/modules/crans/remote_builder.nix b/modules/crans/remote_builder.nix new file mode 100644 index 0000000..06995d5 --- /dev/null +++ b/modules/crans/remote_builder.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ...}: +{ + nix.buildMachines = [{ + hostName = "cephiroth.adm.crans.org"; + system = "x86_64-linux"; + + maxJobs = 2; + speedFactor = 2; + + supportedFeatures = [ "kvm" "big-parallel" ]; + }]; + + nix.distributedBuilds = true; + + nix.extraOptions = '' + builders-use-substitutes = true + ''; +}