From a2d0586d6caa560041fa42890644c787a9f49c9e Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Wed, 24 Aug 2022 10:47:08 +0200 Subject: [PATCH] update hw configs and host ssh keys --- nixops/ekman/hw/c0-1.nix | 10 ++++------ nixops/ekman/hw/c0-2.nix | 10 ++++------ nixops/ekman/pubkeys/c0-1.pub | 2 +- nixops/ekman/pubkeys/c0-2.pub | 1 + 4 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 nixops/ekman/pubkeys/c0-2.pub diff --git a/nixops/ekman/hw/c0-1.nix b/nixops/ekman/hw/c0-1.nix index e1eceaf..62bba1a 100644 --- a/nixops/ekman/hw/c0-1.nix +++ b/nixops/ekman/hw/c0-1.nix @@ -8,24 +8,22 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/102a2e89-1ffb-4f8b-810e-b742b6f9da98"; + { device = "/dev/disk/by-uuid/7e98da6d-a33d-4845-9123-7e351ad0a39e"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/54C4-7983"; + { device = "/dev/disk/by-uuid/6ACD-6E5F"; fsType = "vfat"; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/29ba5bab-0777-4ac1-96af-3952e28d570c"; } - ]; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixops/ekman/hw/c0-2.nix b/nixops/ekman/hw/c0-2.nix index 08c97b3..aafd1e4 100644 --- a/nixops/ekman/hw/c0-2.nix +++ b/nixops/ekman/hw/c0-2.nix @@ -8,24 +8,22 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/e19cbe18-e194-47f6-8eb5-c60b5be1bb7a"; + { device = "/dev/disk/by-uuid/d7fdc1a4-39fe-4260-be6c-1857ce972d7e"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6A07-053A"; + { device = "/dev/disk/by-uuid/0B80-A90E"; fsType = "vfat"; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/2100e403-0dff-4314-b85a-cad99820aacf"; } - ]; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixops/ekman/pubkeys/c0-1.pub b/nixops/ekman/pubkeys/c0-1.pub index 41e42c2..ae87018 100644 --- a/nixops/ekman/pubkeys/c0-1.pub +++ b/nixops/ekman/pubkeys/c0-1.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC11miL1X2hmZ+FZngDIMUECt8Mr7etEF1yXOXMBPwKSLhMaJnIo7+3C1oVlxf0MZjYMA0neIpSB/PpD1PZU89QBrL/HlnEHVChlNoPuTjN3SoMVSwClCf94VW4c5obK4b0EVbJujudreMC7q4sDOzcMVsBwWCZYmOroM1AqQ2dcZFWpj9hk7RWm3UlxnGG8ZPB9i6zzuKECp9W00RznxLaX0Ys6acXIrhg7N1CIZSWyQwQ6hb5bAz6rbTMgub3YZktckVgTlWnpyW6jfR4+xJW5fM5uVcW1kgSP/xQ+sAnAvH099ogBZSlv59oBL/jIGAVQwKptxkacues6drsohAocmstxVRyatBtEMBp5Grn+pzoDH6cIYTXy3qAgpUzQCnSsW6ttG2cVtPvw/3OSgYsJ1J0VHWfJ8AVBDpRahOa20A7hXR0RzbeRJ4xX4Fu4ndcaR+GTdLSBfb/WSyn1751WZmxqegFnjhuKNcxqKj2tjzm9/oKPtO0Ri8bIDVtLSjTJ4Vhed5I2X50Du9YBcbee1FtqHZV09OCfGRWKL39721b+gmC0JYKHCU6NpAnxa1jjrDJieYCKDsmQtXfWm1mtXeVir4I31ufWUJoGc0YTl/qWpcCVKPDmQHBRLvv7pqU2Fz/FkW+7mePf73Ympc1PRfxNoiP8oeQyPzsmN0liw== root@OBNODE01 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDKMILMKLqs/kq0ToCFJRRIaJFPh0FP0IHGjrg1G+UXB5aepVQ0GgiFeG9RiAtXbCNEqJDTXfhRRY2FJoNOghFEZ0Z6ECfbvS79OT8XDu2iouMHmu3Xtbh0LGNdoV3LHoSOrcUZnQwQXeQu5J12AIbyC5ng3vOf3Ud9pVehM7WqRegSiaqacneISfq1JtHzWcO7P/Rd9DtyEuFDuTZHLSPrF4+bnbLW7WIgPGTzs28PvWurhmZg01ahcadACAeDmxVFHvSjZbNJbFMPVrNkJbNzXyw8v2WN8wISmiMbJ+ANi/zBgiyc+TOgnbb3us5m6+qkhK7MboQz22y3aFFb/hUENk5aQEpyp7zG5Ua80eGue3EZ5iLselHI7J6w3UUST0tzY7J5uwhKI6Vx6m70s5qUZWG0oF06Y/+xC6GNu5+JBDd7E7l/TjXTtSmlVXcUOjhqK+qtwOsNtFKdWGthdEKuNoa4sfv7tkmtXIvjBuceUMgaHB0hQYm34cj5k82GXdg8U5xkf7dQkv0M2VrPJ2f8KvjSlVM3YvMQ5Pb6WaB5kP0PGEsDY0X5OHMwc6UhYhngJo1sIlwYQwXVQtjj0wVO4jEuGZczgq3FqusHXbD8uOy3eQxLIZOebvzhAnzaDfXhyIM8jhG9WHQMprJf+No+LlisPEBOlnHcxylsCV8VGQ== root@nixos diff --git a/nixops/ekman/pubkeys/c0-2.pub b/nixops/ekman/pubkeys/c0-2.pub new file mode 100644 index 0000000..2822ed3 --- /dev/null +++ b/nixops/ekman/pubkeys/c0-2.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwC5iT7ZRgapwdzsgmFEkOETikSjDAX/z5peDh5G5rKSoakmSqde3tRJ5fRk1vptW/LkToZT+wU7F6PBQRuI/OyOBIud5Vubr+lqctHy2AfvI1x8SdMRPAIpAhklISKsV9iQH+oMgl7ND4gfLblBbLksQ8iCojlsXcoTwjlt8HYnGNJV/kC5leIIibKDzyMjC0F0jlMiWbK07WllmT0ecNssSV5HNVbY29lW9Fv6J25gp0i025lpB9GC0PiIOoxMVzYRNJCEi1nNPNipuNFOx3XnwRjbVvM1KEP4JqavgXVFXUr2at0C0x+hcKtQ7LpdyvmmAywTMTTljhdU/0jNw8pk57HhpJ1rXQZm4SIqL7gdwDy91KLM3qE1MjzocWZw4YBNDfeNSS6qalxowuut354x8UItEjIwy1uofRF8RKB7LQYqKbXHWCZeA+3rNA4E+QIuvbwX8HObMS9JXzTUSUL7r53rAFNVifYSey6u2iZ+PT+jKkXKOCOE6fuCy/MPVaiJVwtd0wVsgC4HH6CvrJf1dwlI5Av4B8LrnZNgpjog+aqgDHjRRY+3ys5Iwt+DqHHLGiHyoM/mbF0Hl5GQ3SLdfhn27zLndLnBg6uBSIRmssn0Vech4gndy4nUNZpWyKWoy4lt5aVLOoojD9G3Kp5XfQVOlJToU9D73n01hclw== root@nixos