clan/clan-infra
10
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: don't add options to clan.core #209

Merged
clan-bot merged 1 commits from DavHau/clan-infra:DavHau-dave into main 2024-07-05 10:25:58 +00:00
Conversation 0 Commits 1 Files Changed 2 +10 -9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/initrd-networking.nix
View File

@ -1,21 +1,21 @@
{ config, lib, ... }: { config, lib, ... }:
let let
cfg = config.clan.networking; cfg = config.clan-infra.networking;
in in
{ {
options = { options = {
clan.networking.ipv4.address = lib.mkOption { type = lib.types.str; }; clan-infra.networking.ipv4.address = lib.mkOption { type = lib.types.str; };
clan.networking.ipv4.cidr = lib.mkOption { clan-infra.networking.ipv4.cidr = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "26"; default = "26";
}; };
clan.networking.ipv4.gateway = lib.mkOption { type = lib.types.str; }; clan-infra.networking.ipv4.gateway = lib.mkOption { type = lib.types.str; };
clan.networking.ipv6.address = lib.mkOption { type = lib.types.str; }; clan-infra.networking.ipv6.address = lib.mkOption { type = lib.types.str; };
clan.networking.ipv6.cidr = lib.mkOption { clan-infra.networking.ipv6.cidr = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "64"; default = "64";
}; };

7
targets/web01/configuration.nix
View File

@ -8,9 +8,10 @@
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3080:418b::1"; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3080:418b::1";
clan.networking.targetHost = "root@clan.lol"; clan.networking.targetHost = "root@clan.lol";
clan.networking.ipv4.address = "65.21.12.51"; clan-infra.networking.ipv4.address = "65.21.12.51";
clan.networking.ipv4.gateway = "65.21.12.1"; clan-infra.networking.ipv4.gateway = "65.21.12.1";
clan.networking.ipv6.address = config.systemd.network.networks."10-uplink".networkConfig.Address; clan-infra.networking.ipv6.address =
config.systemd.network.networks."10-uplink".networkConfig.Address;
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }