Fachschaft/nixConfig
5
2
Fork 2
Code Issues 7 Pull requests 1 Projects 1 Wiki Activity

[#33] Refactored existing network config #34

Merged
nerf merged 1 commit from nerf/nixConfig:nerf/networkConfig into main 2024-04-03 13:30:20 +00:00
Conversation 0 Commits 1 Files changed 3 +50 -17
3 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cabd210aa6 - Show all commits

3
nixos/machines/ghatanothoa/configuration.nix
View file

@ -4,7 +4,7 @@
../../modules/jitsi.nix
../../roles
../../roles/vm.nix
./network.nix
../../modules/vmNetwork.nix
];
services.mathebau-jitsi = {
@ -14,5 +14,6 @@
# System configuration here
networking.hostName = "ghatanothoa";
vmNetwork.ipv4 = "192.168.0.25";
system.stateVersion = "23.11";
}

16
nixos/machines/ghatanothoa/network.nix
View file

@ -1,16 +0,0 @@
# We sohuld put that config somewhere in roles and give it a parameter or something,
# everyone gets the same nameserver and the same prefixLength and address vs defaultGateway alsways
# depend on the same thing
{
imports = [];
networking = {
interfaces.enX0.ipv4.addresses = [
{
address = "192.168.0.25";
prefixLength = 16;
}
];
defaultGateway = "192.168.0.152";
nameservers = ["130.83.2.22" "130.83.56.60" "130.83.22.60" "130.82.22.63"];
};
}

48
nixos/modules/vmNetwork.nix Normal file
View file

@ -0,0 +1,48 @@
{
lib,
config,
...
}: let
inherit
(lib)
mkOption
types
last
init
;
inherit
(lib.strings)
splitString
concatStringsSep
toInt
;
cfg = config.vmNetwork;
in {
imports = [];
Gonne commented 2024-04-01 14:53:46 +00:00
Outdated
Review
Copy link

Ist es üblich oder notwendig, leere Imports mit hinzuschreiben?

Ist es üblich oder notwendig, leere Imports mit hinzuschreiben?
nerf commented 2024-04-02 14:05:11 +00:00
Outdated
Review
Copy link

I'm not sure if it is required (I would guess no). But I kind of find it idiomatic to put it there. We should agree if we do it or not and then enforce it across the whole codebase.

I'm not sure if it is required (I would guess no). But I kind of find it idiomatic to put it there. We should agree if we do it or not and then enforce it across the whole codebase.
Gonne commented 2024-04-02 16:42:59 +00:00
Outdated
Review
Copy link

I don't mind. One precedent is https://nixos.wiki/wiki/NixOS_modules#Example which leaves it out. 🤷

I don't mind. One precedent is https://nixos.wiki/wiki/NixOS_modules#Example which leaves it out. 🤷
options.vmNetwork = {
ipv4 = mkOption {
type = types.str;
description = "the ipv4 adress of this machine";
};
};
config = {
networking = {
interfaces.enX0.ipv4.addresses = [
{
address = cfg.ipv4;
prefixLength = 16;
}
];
defaultGateway = let
addr = splitString "." cfg.ipv4;
addrInit = init addr;
addrLastInt = builtins.toString (toInt (last addr) + 127);
in
concatStringsSep "." (addrInit ++ [addrLastInt]);
# https://www.hrz.tu-darmstadt.de/services/it_services/nameserver_dns/index.de.jsp
nerf marked this conversation as resolved Outdated
Gonne commented 2024-04-01 14:52:38 +00:00
Outdated
Review
Copy link

Hierzu sollten wir die Quelle https://www.hrz.tu-darmstadt.de/services/it_services/nameserver_dns/index.de.jsp verlinken. Aus dieser geht hervor, dass die Zeile in Reihenfolge der Hostnamen

      nameservers = ["130.83.22.63" "130.83.22.60" "130.83.56.60"];

lauten sollte. Der Server unter 130.83.2.22 hingegen liefert mir keine Antworten (mehr).

Hierzu sollten wir die Quelle https://www.hrz.tu-darmstadt.de/services/it_services/nameserver_dns/index.de.jsp verlinken. Aus dieser geht hervor, dass die Zeile in Reihenfolge der Hostnamen ``` nameservers = ["130.83.22.63" "130.83.22.60" "130.83.56.60"]; ``` lauten sollte. Der Server unter `130.83.2.22` hingegen liefert mir keine Antworten (mehr).
nameservers = ["130.83.22.63" "130.83.22.60" "130.83.56.60"];
};
};
}