Skip to content
Snippets Groups Projects
Commit 108796a0 authored by Florian Sesser's avatar Florian Sesser
Browse files

Clean up, whitespace/comment/line ordering only changes

parent 4d45d824
Branches
No related tags found
No related merge requests found
......@@ -7,36 +7,40 @@ import ../../lib/make-grid.nix {
nodes = cfg:
let
sshUsers = import ../../../../PrivateStorageSecrets/localdev-users.nix;
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ]; # TBD: derive automatically
# TBD: derive these automatically:
hostsMap = {
"172.23.23.1" = [ "monitoring1" "monitoring1.monitoringvpn" ];
"172.23.23.11" = [ "payments1" "payments1.monitoringvpn" ];
"172.23.23.12" = [ "storage1" "storage1.monitoringvpn" ];
"172.23.23.13" = [ "storage2" "storage2.monitoringvpn" ];
};
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ];
nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ];
in {
"payments1" = import ../../lib/make-issuer.nix (rec {
publicIPv4 = "192.168.67.21";
monitoringvpnIPv4 = "172.23.23.11";
inherit sshUsers;
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.03";
inherit sshUsers;
} // cfg);
"storage1" = import ../../lib/make-testing.nix (rec {
publicIPv4 = "192.168.67.22";
monitoringvpnIPv4 = "172.23.23.12";
inherit sshUsers;
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.09";
inherit sshUsers;
} // cfg);
"storage2" = import ../../lib/make-testing.nix (rec {
publicIPv4 = "192.168.67.23";
monitoringvpnIPv4 = "172.23.23.13";
inherit sshUsers;
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.09";
inherit sshUsers;
} // cfg);
"monitoring1" = import ../../lib/make-monitoring.nix (rec {
......@@ -44,11 +48,11 @@ import ../../lib/make-grid.nix {
monitoringvpnIPv4 = "172.23.23.1";
inherit vpnClientIPs;
inherit hostsMap;
inherit sshUsers;
nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ]; # TBD: derive automatically
inherit nodeExporterTargets;
nginxExporterTargets = [ ];
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.09";
inherit sshUsers;
} // cfg);
};
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment