diff options
| -rw-r--r-- | cluster/staging/cluster.nix | 2 | ||||
| -rw-r--r-- | cluster/staging/node/caribou.nix | 5 | ||||
| -rwxr-xr-x | deploy_wg | 2 | ||||
| -rw-r--r-- | ssh_known_hosts | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix index 15e0f04..bd953f8 100644 --- a/cluster/staging/cluster.nix +++ b/cluster/staging/cluster.nix @@ -27,7 +27,7 @@ { hostname = "caribou"; site_name = "neptune"; - publicKey = "X1OlfgjZDdJw3yTg0ytGFlJZXzqT0yHJmYP15R9IpD8="; + publicKey = "lABn/axzD1jkFulX8c+K3B3CbKXORlIMDDoe8sQVxhs="; IP = "10.14.1.3"; lan_endpoint = "192.168.1.23:33799"; endpoint = "192.168.1.23:33799"; ## TODO nat diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix index caa55fa..65168a9 100644 --- a/cluster/staging/node/caribou.nix +++ b/cluster/staging/node/caribou.nix @@ -3,11 +3,6 @@ { config, pkgs, ... }: { - imports = - [ - ./remote-unlock.nix - ]; - # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.timeout = 20; @@ -1,6 +1,6 @@ #!/usr/bin/env ./sshtool -cmd 'nix-env -i wireguard' +cmd 'nix-env -i wireguard-tools' cmd 'mkdir -p /var/lib/deuxfleurs/wireguard-keys' cmd 'test -f /var/lib/deuxfleurs/wireguard-keys/private || (wg genkey > /var/lib/deuxfleurs/wireguard-keys/private; chmod 600 /var/lib/deuxfleurs/wireguard-keys/private)' cmd 'echo "Public key: $(wg pubkey < /var/lib/deuxfleurs/wireguard-keys/private)"' diff --git a/ssh_known_hosts b/ssh_known_hosts index 0086540..9b1c4d1 100644 --- a/ssh_known_hosts +++ b/ssh_known_hosts @@ -5,7 +5,6 @@ 192.168.1.33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 2a06:a004:3024::21 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXTUrXRFhudJBESCqjHCOttzqYPyIzpPOMkI8+SwLRx 2a06:a004:3024::22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMf/ioVSSb19Slu+HZLgKt4f1/XsL+K9uMxazSWb/+nQ -192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2QRbcclYmteMRLIaxOBBBQe/OGF1T+PtSAR249r4VM doradille.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKzVJB1XYBC/rMxb7UfAoCzKH/l6oE4NKsSErCv2wV94 dahlia.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQsdIYUn4njMRAuT0/8GzqGn6zGn9014BAkT7VSVf2H diplotaxis.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcVtfOj0ti6eYsFSq2gbBGhaf8E7p/QiO3/MVX1D32T @@ -24,3 +23,4 @@ df-ymf.machine.deuxfleurs.fr ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2el374ejNXqF+ 2001:910:1204:1::33 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuY1CvhxBP9BtKkTlmOUu6Hhy8OQTB3R8OCFXbHA/RA 2001:910:1204:1::31 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3N0QOFNGkCpVLuOHFdpnBaxIFH925KpdIHV/3F9+BR 2001:910:1204:1::32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPCXJeo6yeQeTN7D7OZwLd8zbyU1jWywlhQ29yyk7x+G +192.168.1.23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtsVFIoIu6tnYrzlcCbBiQXxNkFSWVMhMznUuSxGZ22 |