joepie91/morph-rc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor network references

Browse source
This commit is contained in:
Sven Slootweg 2022-02-27 22:48:16 +01:00
parent bc4af3390c
commit 11ddc93640
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configuration/data/nodes.nix
View file

@ -1,4 +1,6 @@
{
let
injectHostnames = builtins.mapAttrs (hostname: attributes: { hostname = hostname; } // attributes);
in injectHostnames {
"machine-workbot-01.cryto.net" = {
friendlyName = "workbot";
ipv4 = "148.251.195.23";

46
configuration/default.nix
View file

@ -36,7 +36,9 @@ in {
description = "Cryto";
};
"machine-borg2-01.cryto.net" = { pkgs, lib, ... }: {
"machine-borg2-01.cryto.net" = let
self = nodes."machine-borg2-01.cryto.net";
in { pkgs, lib, ... }: {
system.stateVersion = "18.09";
networking.hostName = "machine-borg2-01";
@ -47,9 +49,9 @@ in {
presets.base
presets.kvm
./hardware-configurations/machine-borg2-01.nix
(tincConfiguration { hostname = "machine-borg2-01.cryto.net"; nodes = nodes; })
(trackSystemMetrics nodes."machine-borg2-01.cryto.net".internalIpv4)
(trackServiceMetrics nodes."machine-borg2-01.cryto.net".internalIpv4)
(tincConfiguration { hostname = self.hostname; nodes = nodes; })
(trackSystemMetrics self.internalIpv4)
(trackServiceMetrics self.internalIpv4)
];
boot.loader.grub.device = lib.mkForce "/dev/vda";
@ -101,7 +103,9 @@ in {
};
};
"machine-haless-03.cryto.net" = { pkgs, lib, config, ... }@args: {
"machine-haless-03.cryto.net" = let
self = nodes."machine-haless-03.cryto.net";
in { pkgs, lib, config, ... }@args: {
system.stateVersion = "19.03";
networking.hostName = "machine-haless-03";
@ -109,9 +113,9 @@ in {
presets.base
presets.kvm
./hardware-configurations/machine-haless-03.nix
(tincConfiguration { hostname = "machine-haless-03.cryto.net"; nodes = nodes; })
(trackSystemMetrics nodes."machine-haless-03.cryto.net".internalIpv4)
(trackServiceMetrics nodes."machine-haless-03.cryto.net".internalIpv4)
(tincConfiguration { hostname = self.hostname; nodes = nodes; })
(trackSystemMetrics self.internalIpv4)
(trackServiceMetrics self.internalIpv4)
(httpHealthChecks {
both = [
"iomfats.cryto.net"
@ -226,7 +230,9 @@ in {
};
};
"machine-konjassiem-02.cryto.net" = { pkgs, lib, config, ... }@args: {
"machine-konjassiem-02.cryto.net" = let
self = nodes."machine-konjassiem-02.cryto.net";
in { pkgs, lib, config, ... }@args: {
system.stateVersion = "20.03";
networking.hostName = "machine-konjassiem-02";
@ -234,9 +240,9 @@ in {
presets.base
presets.kvm
./hardware-configurations/machine-konjassiem-02.nix
(tincConfiguration { hostname = "machine-konjassiem-02.cryto.net"; nodes = nodes; })
(trackSystemMetrics nodes."machine-konjassiem-02.cryto.net".internalIpv4)
(trackServiceMetrics nodes."machine-konjassiem-02.cryto.net".internalIpv4)
(tincConfiguration { hostname = self.hostname; nodes = nodes; })
(trackSystemMetrics self.internalIpv4)
(trackServiceMetrics self.internalIpv4)
(httpHealthChecks {
both = [ "git.cryto.net" ];
})
@ -373,7 +379,9 @@ in {
};
};
"machine-pikachu-02.cryto.net" = { pkgs, lib, config, ... }@args: {
"machine-pikachu-02.cryto.net" = let
self = nodes."machine-pikachu-02.cryto.net";
in { pkgs, lib, config, ... }@args: {
system.stateVersion = "19.03";
networking.hostName = "machine-pikachu-02";
@ -381,20 +389,22 @@ in {
presets.base
presets.kvm
./hardware-configurations/machine-pikachu-02.nix
(tincConfiguration { hostname = "machine-pikachu-02.cryto.net"; nodes = nodes; })
(trackSystemMetrics nodes."machine-pikachu-02.cryto.net".internalIpv4)
(trackServiceMetrics nodes."machine-pikachu-02.cryto.net".internalIpv4)
(tincConfiguration { hostname = self.hostname; nodes = nodes; })
(trackSystemMetrics self.internalIpv4)
(trackServiceMetrics self.internalIpv4)
];
};
"machine-workbot-01.cryto.net" = { pkgs, lib, config, ... }@args: {
"machine-workbot-01.cryto.net" = let
self = nodes."machine-workbot-01.cryto.net";
in { pkgs, lib, config, ... }@args: {
system.stateVersion = "18.03";
networking.hostName = "machine-workbot-01";
imports = [
presets.base
./hardware-configurations/machine-workbot-01.nix
(tincConfiguration { hostname = "machine-workbot-01.cryto.net"; nodes = nodes; })
(tincConfiguration { hostname = self.hostname; nodes = nodes; })
(trackSystemMetrics "127.0.0.1")
(trackServiceMetrics "127.0.0.1")
(httpHealthChecks {