home

commit df03fc04811a01ba2ced950fd9744a0763520999
parent 042e7b858dd973e40904747868ccde7c475252f8
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 29 Apr 2022 13:00:20 +0200

machines: update some keys

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
ops/hosts.toml
 | 
23
+++++++++++++++++++++++
M
secrets/machines.nix
 | 
3
++-

2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/ops/hosts.toml b/ops/hosts.toml
@@ -37,6 +37,29 @@ features = [ "big-parallel", "kvm", "nixos-test" ]
 pubkey = "U10ozKSCnTm8aD5i6UULSJHQPouoswtNkwFI3P9Lw3Y="
 addrs = { v4 = "10.100.0.8" }
 
+[hosts.shikoku]
+network = "vpn"
+ssh = { pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGxstR3xEf87leVVDS3GVPx8Ap9+eP+OfkSvM26V54XP vincent@shikoku", gpgRemoteForward = true }
+addrs = { v4 = "192.168.1.24" }
+
+[hosts.shikoku.builder]
+maxJobs = 8
+systems = [ "x86_64-linux", "aarch64-linux", "armv7l-linux", "armv6l-linux", "powerpc64le-linux", "s390x-linux" ]
+features = [ "big-parallel", "kvm", "nixos-test" ]
+
+[hosts.shikoku.wireguard]
+pubkey = "foUoAvJXGyFV4pfEE6ISwivAgXpmYmHwpGq6X+HN+yA="
+addrs = { v4 = "10.100.0.2" }
+
+[hosts.sakhalin]
+network = "vpn"
+ssh = { pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHspuKkxiLuuRjNsLCXFA51DGWdHo/9TGW4YZmQGKbm+ vincent@sakhalin", gpgRemoteForward = true }
+addrs = { v4 = "192.168.1.70" }
+
+[hosts.sakhalin.wireguard]
+pubkey = "OAjw1l0z56F8kj++tqoasNHEMIWBEwis6iaWNAh1jlk="
+addrs = { v4 = "10.100.0.16" }
+
 [hosts.kerkouane]
 network = "vpn"
 # addrs = { v4 = "167.99.17.238" } # FIXME probably not right
diff --git a/secrets/machines.nix b/secrets/machines.nix
@@ -102,7 +102,8 @@ let
       authorized = true;
     };
     yubikey5 = {
-      key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJoArpBsTXr3m6q2QnA1vI1DSwmgdU0OAp7DUxcxl9CJfeZIEs/iAerk8jmHgJ2xCEF6SpzI0FWSQIXy8dKpF4wLJ0tCoq5LqQx3jEzy3NUBLfxK+/Baa1te4qG2YImlgnzmEEm5uZlCGZRY2L/U9+4Hwo1AgD69Zzin6QGh2pyTWpmZ/WyhwIfGgqsnlM9XlaVzlMHYfStDi+rUU6XEAfdSqo1SnWKDBHc3mDYGTVhfAlt2LucLKu7oI2MsSlSxva072BExctadtB3TGHbt8gRJZj8CdwgRNhT+hFfbsL6YDvQn6dhTSMuiD8sBEvVble0Nj4p+Q6ROCRIuMuhgh3 cardno:000610153832";
+      # key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJoArpBsTXr3m6q2QnA1vI1DSwmgdU0OAp7DUxcxl9CJfeZIEs/iAerk8jmHgJ2xCEF6SpzI0FWSQIXy8dKpF4wLJ0tCoq5LqQx3jEzy3NUBLfxK+/Baa1te4qG2YImlgnzmEEm5uZlCGZRY2L/U9+4Hwo1AgD69Zzin6QGh2pyTWpmZ/WyhwIfGgqsnlM9XlaVzlMHYfStDi+rUU6XEAfdSqo1SnWKDBHc3mDYGTVhfAlt2LucLKu7oI2MsSlSxva072BExctadtB3TGHbt8gRJZj8CdwgRNhT+hFfbsL6YDvQn6dhTSMuiD8sBEvVble0Nj4p+Q6ROCRIuMuhgh3 cardno:000610153832";
+      key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJoArpBsTXr3m6q2QnA1vI1DSwmgdU0OAp7DUxcxl9CJfeZIEs/iAerk8jmHgJ2xCEF6SpzI0FWSQIXy8dKpF4wLJ0tCoq5LqQx3jEzy3NUBLfxK+/Baa1te4qG2YImlgnzmEEm5uZlCGZRY2L/U9+4Hwo1AgD69Zzin6QGh2pyTWpmZ/WyhwIfGgqsnlM9XlaVzlMHYfStDi+rUU6XEAfdSqo1SnWKDBHc3mDYGTVhfAlt2LucLKu7oI2MsSlSxva072BExctadtB3TGHbt8gRJZj8CdwgRNhT+hFfbsL6YDvQn6dhTSMuiD8sBEvVble0Nj4p+Q6ROCRIuMuhgh3 cardno:10 153 832";
       authorized = true;
     };
     kerkouane = {