Continue intake of upgraded macs
Graham Christensen committed
Sep 28, 2019 at 22:11 UTC
52ccff80cdc2af14aaad1b37d0fe20f7a105cc69
4 files changed
+32
-9
delft/hydra.nix
+11
-1
@@ -164,7 +164,17 @@ in
164
[
165
{ hostNames = [ "83.87.124.39" ]; publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVTkY4tQ6V29XTW1aKtoFJoF4uyaEy0fms3HqmI56av8UCg3MN5G6CL6EDIvbe46mBsI3++V3uGiOr0pLPbM9fkWC92LYGk5f7fNvCoy9bvuZy5bHwFQ5b5S9IJ1o3yDlCToc9CppmPVbFMMMLgKF06pQiGBeMCUG/VoCfiUBq+UgEGhAifWcuWIOGmdua6clljH5Dcc+7S0HTLoVtrxmPPXBVZUvW+lgAJTM6FXYIZiIqMSC2uZHGVstY87nPcZFXIbzhlYQqxx5H0um2bL3mbS7vdKhSsIWWaUZeck9ghNyUV1fVRLUhuXkQHe/8Z58cAhTv5dDd42YLB0fgjETV"; }
166
167
- # (for i in $(seq 6000 6010); do ssh-keyscan -t ssh-ed25519 -p $i 37.153.215.191 2> /dev/null; done) | sed -e 's/^/ { hostNames = [ "/' -e 's/ ssh/" ]; publicKey = "ssh/' -e 's/$/"; }/'; echo
167
+ # (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
168
+
169
+ { hostNames = [ "[10.254.2.2]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICIzkQ2sjmphJL2oo1FSA/3F7/G+YTraWuPYUXBdZJ/t"; }
170
+ { hostNames = [ "[10.254.2.3]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHDnJQyL2LlWjIE+4wGBZyTapXlCgwTZ+uBh7eoaGPfL"; }
171
+ { hostNames = [ "[10.254.2.4]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBq44jmyZD6fQY+WLPH3Dx9mQXzCK7ZBpfmYjATVvT7T"; }
172
+ { hostNames = [ "[10.254.2.5]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEKH3SXo9u27y105FLNz1PxrDMBZ0gAsBsC9t2ErHbx4"; }
173
+ { hostNames = [ "[10.254.2.6]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBNU5/bIy24ea7twM6j7QAKs1KWJADYNfov94N9YjlVz"; }
174
+ { hostNames = [ "[10.254.2.7]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8AwqnYcZhj1jINB5HMAT+VBl+rPH9TCeHPtZMwMIUJ"; }
175
+ { hostNames = [ "[10.254.2.8]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAYH18PbDKKNmRaRYdMbbSqJSC+g5yB83LLSNemxhoCE"; }
176
+ { hostNames = [ "[10.254.2.9]:2200" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4oOQBk3nRMKcPsDAL54jMAfSy9fwCyfH1qWwp1jwQt"; }
177
+
178
179
{ hostNames = [ "208.78.106.251" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKrwg2592DfDUG1U0LZxJcBaT35YfEsuKo4helEAzeoujvzOo4DIaBrTCX7+LxcYZlGoi4WvsnwxUG11GY12l2A="; }
180
{ hostNames = [ "208.78.106.252" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLV1p6f6Rk3rKwNJbcqvG68wjfT3wPcJfChc1LFU9A3tTFslUDr47FHLmT+FTr+ChkoqD6Gsl+jtSnvkYnTlpGY="; }
delft/network.nix
+7
-7
@@ -61,7 +61,7 @@ in {
61
};
62
63
mac3 = makeMac {
64
- ip = "mac3";
64
+ ip = "10.254.2.3";
65
extra = {
66
imports = [
67
../macs/nodes/mac3.nix
@@ -70,7 +70,7 @@ in {
70
};
71
72
mac4 = makeMac {
73
- ip = "mac4";
73
+ ip = "10.254.2.4";
74
extra = {
75
imports = [
76
../macs/nodes/mac4.nix
@@ -79,7 +79,7 @@ in {
79
};
80
81
mac5 = makeMac {
82
- ip = "mac5";
82
+ ip = "10.254.2.5";
83
extra = {
84
imports = [
85
../macs/nodes/mac5.nix
@@ -88,7 +88,7 @@ in {
88
};
89
90
mac6 = makeMac {
91
- ip = "mac6";
91
+ ip = "10.254.2.6";
92
extra = {
93
imports = [
94
../macs/nodes/mac6.nix
@@ -97,7 +97,7 @@ in {
97
};
98
99
mac7 = makeMac {
100
- ip = "mac7";
100
+ ip = "10.254.2.7";
101
extra = {
102
imports = [
103
../macs/nodes/mac7.nix
@@ -106,7 +106,7 @@ in {
106
};
107
108
mac8 = makeMac {
109
- ip = "mac8";
109
+ ip = "10.254.2.8";
110
extra = {
111
imports = [
112
../macs/nodes/mac8.nix
@@ -115,7 +115,7 @@ in {
115
};
116
117
mac9 = makeMac {
118
- ip = "mac9";
118
+ ip = "10.254.2.9";
119
extra = {
120
imports = [
121
../macs/nodes/mac8.nix
macs/host/networking.nix
+3
-1
@@ -52,6 +52,8 @@ in {
52
];
53
};
54
55
+ services.openssh.enable = true;
56
+
57
services.dhcpd4 = {
58
enable = true;
59
interfaces = [ "tap0" ];
@@ -111,6 +113,6 @@ in {
113
exec ${pkgs.socat}/bin/socat TCP-LISTEN:2200,fork,so-bindtodevice=${config.macosGuest.network.sshInterface} TCP:${guestIP}:22
114
'';
115
};
114
-
116
+
117
};
118
}
modules/wireguard.nix
+11
@@ -77,24 +77,35 @@ let
77
};
78
mac2 = {
79
ip = "10.254.2.2";
80
+ publicKey = "m0xJg1OBZIqPu8maxpldLQ1Y39aPS3cnj7hqpVUSuFg=";
81
};
82
mac3 = {
83
ip = "10.254.2.3";
84
+ publicKey = "6urTLKp3ihXw0fy4ImhpiQu/sOxrJYewtg2cbT3jv3g=";
85
};
86
mac4 = {
87
ip = "10.254.2.4";
88
+ publicKey = "ojkldeD0xJw54nAeGSHQw7BMSXnc6c2e6GP4nJ/1xEo=";
89
};
90
mac5 = {
91
ip = "10.254.2.5";
92
+ publicKey = "UgbjJz7BPlD5oDNPr1Bpr4XqeuoL9G5+oUDyU9EVYgg=";
93
};
94
mac6 = {
95
ip = "10.254.2.6";
96
+ publicKey = "5t67sluyRwuDXeY17CG7sbpt0gZNybHzvJYd7NAESis=";
97
};
98
mac7 = {
99
ip = "10.254.2.7";
100
+ publicKey = "q/8YvHa/M0Epyqflp+fEXvBmJuOBaBJPcaAkScCYvHA=";
101
};
102
mac8 = {
103
ip = "10.254.2.8";
104
+ publicKey = "aw/8/5oEn0cZa/WnUE7E7MEukDvzUzaAUEL6PMhLFmE=";
105
+ };
106
+ mac9 = {
107
+ ip = "10.254.2.9";
108
+ publicKey = "i3fOonYJsDhhF8YXrWfaLQgb4J3OphOs7DTTCGTDNCQ=";
109
};
110
};
111