mac1: complete intake
Graham Christensen committed
Sep 30, 2019 at 22:34 UTC
72f59eb51ba4a627dd8897a98c5c9648c1c6c06c
5 files changed
+3
-2
delft/hydra.nix
+1
@@ -142,6 +142,7 @@ in
142
143
# (for i in 10.254.2.{1,2,3,4,5,6,7,8,9}; do ssh-keyscan -t ssh-ed25519 -p 2200 $i 2> /dev/null; done) | sed -e 's/^/ { hostNames = [ "/' -e 's/ ssh/" ]; publicKey = "ssh/' -e 's/$/"; }/'; echo
144
145
+ { hostNames = [ "[10.254.2.1]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHAPtrCAuysFZCzDXlQMrxvybhMMBjpPE4c1vUoUyvvm"; }
146
{ hostNames = [ "[10.254.2.2]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICIzkQ2sjmphJL2oo1FSA/3F7/G+YTraWuPYUXBdZJ/t"; }
147
{ hostNames = [ "[10.254.2.3]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDnJQyL2LlWjIE+4wGBZyTapXlCgwTZ+uBh7eoaGPfL"; }
148
{ hostNames = [ "[10.254.2.4]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBq44jmyZD6fQY+WLPH3Dx9mQXzCK7ZBpfmYjATVvT7T"; }
delft/network.nix
+1
-2
@@ -41,11 +41,10 @@ in {
41
ceres = import ./ceres.nix;
42
43
mac1 = makeMac {
44
- ip = "83.162.34.61";
44
+ ip = "10.254.2.1";
45
extra = {
46
imports = [
47
../macs/nodes/mac1.nix
48
- { deployment.targetPort = 6001; }
48
];
49
};
50
};
modules/prometheus/default.nix
renamed
modules/prometheus/system-version-exporter.sh
renamed
modules/wireguard.nix
+1
@@ -62,6 +62,7 @@ let
62
63
mac1 = {
64
ip = "10.254.2.1";
65
+ publicKey = "T49/SyORWekPRmIzIJjpKQiLzrIhiskGSRD+MH8Jim0=";
66
};
67
mac2 = {
68
ip = "10.254.2.2";