remove vlans and config -> infra

merge-requests/104/head
Pyjacpp 2026-11-15 17:40:11 +01:00
parent cbf1a0bef9
commit c81068ba8e
No known key found for this signature in database
GPG Key ID: ED479A5A26930939
11 changed files with 14 additions and 249 deletions

View File

@ -13,7 +13,7 @@ let
warn warn
; ;
cransConfig = import ../config; infra = import ../infra;
get_hosts_names = path: attrNames (filterAttrs (name: type: type == "directory") (readDir path)); get_hosts_names = path: attrNames (filterAttrs (name: type: type == "directory") (readDir path));
get_info = get_info =
path: path:
@ -30,7 +30,7 @@ let
filePath filePath
]; ];
specialArgs = { specialArgs = {
crans = cransConfig; inherit infra;
}; };
}).config }).config
else else
@ -48,8 +48,7 @@ rec {
nixosSystem { nixosSystem {
specialArgs = inputs // { specialArgs = inputs // {
hosts = all_hosts; hosts = all_hosts;
crans = cransConfig; inherit info infra;
inherit info;
}; };
modules = [ modules = [
(path + "/${name}") (path + "/${name}")

View File

@ -1,16 +1,12 @@
{ {
lib, lib,
config,
crans,
info, info,
... ...
}: }:
let let
inherit (lib) inherit (lib)
mkOption
mkIf mkIf
types
optional optional
; ;
in in

View File

@ -1,6 +1,6 @@
{ {
lib, lib,
crans, infra,
info, info,
... ...
}: }:
@ -55,7 +55,7 @@ in
"ipv6" = null; "ipv6" = null;
} }
) )
) (filterAttrs (n: _: cfg-net.${n}.enable) crans.vlans); # On filtre les interfaces désactivées. ) (filterAttrs (n: _: cfg-net.${n}.enable) infra.vlans); # On filtre les interfaces désactivées.
}; };
}; };
} }

View File

@ -1,230 +0,0 @@
{ lib, ... }:
let
inherit (lib)
mkOption
types
mkDefault
mkForce
;
vlanConf = {
srv = {
id = 2;
description = "Réseau public";
interface = "ens19";
ipv4 = {
address = mkForce "185.230.79.0";
prefixLength = 26;
routes = [
{
address = "0.0.0.0";
via = "185.230.79.62";
prefixLength = 0;
}
];
};
ipv6 = {
address = mkForce "2a0c:700:10::";
routes = [
{
address = "::";
via = "2a0c:700:2::ff:fe00:9902";
prefixLength = 0;
}
];
};
};
srv-nat = {
id = 3;
description = "Réseau derrière un NAT";
interface = "ens19";
ipv4.routes = [
{
address = "0.0.0.0";
via = "172.16.3.99";
prefixLength = 0;
}
];
ipv6 = {
address = mkForce "2a0c:700:3::";
routes = [
{
address = "::";
via = "2a0c:700:3::ff:fe00:9903";
prefixLength = 0;
}
];
};
};
san = {
id = 4;
description = "Accès aux baies de stockages";
interface = "ens19";
};
ceph = {
id = 6;
description = "Réseau interne à ceph";
interface = "ens20";
};
adm = {
id = 10;
description = "Réseau interne";
interface = "ens18";
};
adh = {
id = 12;
description = "Réseau adhérent";
ipv4 = {
address = mkForce "185.230.78.0";
routes = [
{
address = "0.0.0.0";
via = "185.230.78.12";
prefixLength = 0;
}
];
};
ipv6 = {
address = mkForce "2a0c:700:12::";
prefixLength = 48;
routes = [
{
address = "::";
via = "2a0c:700:12::ff:fe00:9912";
prefixLength = 0;
}
];
};
};
adh-adm = {
id = 13;
description = "Réseau d’administration du réseau adhérent";
};
ens = {
id = 2751;
description = "Interconnexion avec l’ENS.";
ipv4 = {
address = mkForce "138.231.136.0";
prefixLength = 29;
};
ipv6 = null;
};
ens-clubs = {
id = 2754;
description = "Réseau clubs interconnecté avec l’ENS";
ipv6 = null;
};
ens-lp = {
id = 2756;
description = "Réseau imprimante interconnecté avec l’ENS";
ipv6 = null;
};
};
ipOpt =
v:
let
maxPrefix = if v == 4 then 32 else 128;
in
types.submodule {
options = {
address = mkOption {
type = types.str;
description = "Adresses IPv${v} du réseau";
};
prefixLength = mkOption {
type = types.ints.between 0 maxPrefix;
default = if v == 4 then 24 else 64;
description = "Prefixe du réseau";
};
routes = mkOption {
default = [ ];
description = "Routes par défaut";
example = [
{
address = "0.0.0.0";
via = "172.16.3.99";
prefixLength = 0;
}
];
type = types.listOf (
types.submodule {
options = {
address = mkOption { type = types.str; };
via = mkOption { type = types.str; };
prefixLength = mkOption { type = types.ints.between 0 maxPrefix; };
};
}
);
};
};
};
in
{
options.crans.vlans = mkOption {
type = types.attrsOf (
types.submodule {
options = {
id = mkOption {
type = types.int;
example = "10";
description = "Id du VLAN";
};
description = mkOption {
type = types.str;
description = "Description du VLAN";
};
interface = mkOption {
type = types.nullOr types.str;
default = null;
example = "ens19";
description = "Interface par défaut du VLAN";
};
ipv4 = mkOption {
type = types.nullOr (ipOpt 4);
description = "Réseau IPv4 du VLAN.";
};
ipv6 = mkOption {
type = types.nullOr (ipOpt 6);
description = "Réseau IPv6 du VLAN.";
};
};
}
);
};
config.crans.vlans = (
builtins.mapAttrs (
vlan: conf:
let
vlan = lib.mod conf.id 100;
in
lib.mkMerge (
[ conf ]
++ lib.optional ((conf.ipv4 or true) != null) {
ipv4.address = mkDefault "172.16.${toString vlan}.0";
}
++ lib.optional ((conf.ipv6 or true) != null) {
ipv6.address = mkDefault "fd00:0:0:${toString vlan}::";
}
)
) vlanConf
);
}

View File

@ -5,6 +5,6 @@ in
{ {
options = { options = {
homeNounou.enable = mkEnableOption "Monter /home_nounou."; homeNounou.enable = mkEnableOption "Monter /home_nounou.";
homeAdh.enable = mkEnableOption "Monter /home-adh"; homeAdh.enable = mkEnableOption "Monter /home-adh.";
}; };
} }

View File

@ -6,12 +6,12 @@ in
options = { options = {
name = mkOption { name = mkOption {
type = types.str; type = types.str;
description = "Nom de la machine"; description = "Nom de la machine.";
}; };
description = mkOption { description = mkOption {
type = types.str; type = types.str;
description = "Description de la machine"; description = "Description de la machine.";
}; };
id = mkOption { id = mkOption {
@ -31,13 +31,13 @@ in
isDebian = mkOption { isDebian = mkOption {
type = types.bool; type = types.bool;
description = "Est-ce que c’est une machine sous Débian ?"; description = "Est-ce que c’est une machine sous Debian ?";
default = false; default = false;
}; };
public-ssh = mkOption { public-ssh = mkOption {
type = types.str; type = types.str;
description = "Clé ssh public de la machine"; description = "Clé ssh publique de la machine.";
}; };
}; };
} }

View File

@ -1,6 +1,6 @@
{ {
config, config,
crans, infra,
lib, lib,
... ...
}: }:
@ -28,7 +28,7 @@ let
description = "Port sur le switch ${n}"; description = "Port sur le switch ${n}";
default = null; default = null;
}) })
) crans.switchs ) infra.switchs
); );
routesType = types.listOf ( routesType = types.listOf (
@ -141,7 +141,7 @@ in
} }
) )
) )
) crans.vlans ) infra.vlans
; ;
}; };

View File

@ -13,7 +13,7 @@ in
type = types.path; type = types.path;
default = ../../secrets/common/root.age; default = ../../secrets/common/root.age;
example = ../../secrets/apprentix/root.age; example = ../../secrets/apprentix/root.age;
description = "Fichier chiffré par age contenant le mot de passe root."; description = "Fichier chiffré par agenix contenant le mot de passe root.";
}; };
}; };
}; };