remote-builders -> known-hosts, add aliases

hosts/bjarte/configuration.nix

@@ -35,7 +35,7 @@
     ../../profiles/desktop/flatpak.nix
     ../../profiles/desktop/waydroid.nix
 
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     #../../profiles/autossh-reverse-tunnels
   ];
 

hosts/bolle/configuration.nix

@@ -22,7 +22,7 @@
     ../../profiles/shell.nix
 
     ../../profiles/domeneshop-dyndns.nix
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     #../../profiles/autossh-reverse-tunnels
   ];
   services.domeneshop-updater.targets = [ config.networking.fqdn ];

hosts/brumlebasse/configuration.nix

@@ -19,7 +19,7 @@
     ../../profiles/shell.nix
 
     #../../profiles/domeneshop-dyndns.nix
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
   ];
   #services.domeneshop-updater.targets = [ config.networking.fqdn ];
 

hosts/eple/configuration.nix

@@ -19,7 +19,7 @@
     ../../profiles/shell.nix
 
     ../../profiles/domeneshop-dyndns.nix
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     #../../profiles/autossh-reverse-tunnels
   ];
   services.domeneshop-updater.targets = [ config.networking.fqdn ];

hosts/garp/configuration.nix

@@ -46,7 +46,7 @@
     #../../profiles/desktop/sound/pipewire.nix
 
     ../../profiles/domeneshop-dyndns.nix
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
   ];
   services.domeneshop-updater.targets = [ config.networking.fqdn ];
 

hosts/hasselknippe/configuration.nix

@@ -33,7 +33,7 @@
     #../../profiles/desktop/lutris.nix
     #../../profiles/desktop/flatpak.nix
 
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
   ];
 
   networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery

hosts/known-hosts.toml

@@ -1,6 +1,7 @@
 # primarily used for remote builders, but also configures known public keys
 
 #["host.name"]
+# aliases = ["other.host.name"]
 # https://search.nixos.org/options?query=nix.buildMachine
 # buildMachine.systems
 # buildMachine.maxJobs
@@ -14,6 +15,8 @@
 # ssh.userPublicKey   # sudo ssh-keygen -t ed25519 && sudo cat /root/.ssh/id_ed25519.pub
 # ssh.proxyJump      # optional hostname
 # ssh.userPrivateKey # optional IdentityFile to use
+# ssh.connectTimeout
+
 
 # buildMachine.supportedFeatures:
 #  - "kvm"          - has hypervisor
@@ -22,6 +25,7 @@
 #  - "big-parallel" - is beefy, for stuff like llvm
 
 [__default__]
+aliases = []
 buildMachine.systems = ["x86_64-linux", "i686-linux"]
 buildMachine.maxJobs = 0 # not a builder
 buildMachine.speedFactor = 1
@@ -31,6 +35,7 @@ buildMachine.protocol = "ssh" # "ssh-ng"
 ssh.listenUser = "pbsds" # TODO: change
 # ssh.listenUser = "nixbld-remote"
 ssh.listenPort = 22
+ssh.connectTimeout = 3
 
 # in general:
 #   headless:  one job per 4 threads and 8GB RAM
@@ -45,6 +50,7 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkk
 ssh.proxyJump = "isvegg.pvv.ntnu.no"
 
 ["eple.pbsds.net"] # r9 290x
+aliases = [ "eple.tail9aac63.ts.net" ]
 buildMachine.maxJobs = 3 # 12 threads 32GB
 buildMachine.speedFactor = 3 # i7-5820K
 buildMachine.supportedFeatures = ["kvm", "big-parallel", "nixos-test"]
@@ -60,12 +66,14 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7P
 ssh.proxyJump = "isvegg.pvv.ntnu.no"
 
 ["noximilien.pbsds.net"]
+aliases = [ "noximilien.tail9aac63.ts.net" ]
 # buildMachine.maxJobs = 1 # 8 threads 8GB
 buildMachine.speedFactor = 1 # i7-3770S
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5AIGqJnBttKaBqMgNXp3Md7t4"
 ssh.userPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien"
 
 ["sopp.pbsds.net"] # gtx 1080
+aliases = [ "sopp.tail9aac63.ts.net" ]
 # buildMachine.maxJobs = 2 # 8 threads 32GB
 buildMachine.speedFactor = 2 # i7-4790K
 buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda"]
@@ -74,6 +82,7 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYB9H1pHB1vTBiGhO/GC
 ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+Z7HFYYaf1d4M6mvSK2nAU root@sopp"
 
 ["nord.pbsds.net"] # rx 580
+aliases = [ "nord.tail9aac63.ts.net" ]
 # buildMachine.maxJobs = 1 # 4 threads 32GB
 buildMachine.speedFactor = 1 # i5-2500
 buildMachine.supportedFeatures = ["kvm", "nixos-test"]
@@ -88,6 +97,7 @@ ssh.listenUser = "pbsds"
 ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q2PFxuqB3URpgTHid06Vw7we"
 
 ["bjarte.pbsds.net"]
+aliases = [ "bjarte.tail9aac63.ts.net" ]
 ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte"
 
 ["brumlebasse.pbsds.net"]

hosts/nord/configuration.nix

@@ -40,7 +40,7 @@
     ../../profiles/desktop/steam.nix
     ../../profiles/desktop/flatpak.nix
 
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     #../../profiles/autossh-reverse-tunnels
     #../../profiles/domeneshop-dyndns.nix # handled by noximilien
   ];

hosts/noximilien/configuration.nix

@@ -90,7 +90,7 @@
 
     #../../profiles/code-remote # TODO: move into web? services?
     ../../profiles/domeneshop-dyndns.nix
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     ../../profiles/autossh-reverse-tunnels
     #../../profiles/xrdp
   ];

hosts/sopp/configuration.nix

@@ -49,7 +49,7 @@
     ../../profiles/desktop/lutris.nix
     ../../profiles/desktop/flatpak.nix
 
-    ../../profiles/remote-builders.nix
+    ../../profiles/known-hosts.nix
     #../../profiles/autossh-reverse-tunnels
     #../../profiles/domeneshop-dyndns.nix # handled by noximilien
   ];