diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix index 5c9b2d3..e1f49b6 100644 --- a/clusters/k2/default.nix +++ b/clusters/k2/default.nix @@ -10,7 +10,7 @@ let ]; customize = { - boot.uefi = false; + boot.uefi = true; }; cluster = { @@ -21,7 +21,6 @@ let adminAuthorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no" ]; @@ -34,8 +33,8 @@ let hw = ./k2-0.nix; }; nodes = hosts; - cidr = "10.11.0.0/16"; - fileserver = "fs0-0"; + cidr = "10.100.0.0/16"; + fileserver = "fs2-0"; charts = { acme_email = "innovasjon@itpartner.no"; grafana_smtp_user = "utvikling"; diff --git a/clusters/k2/k2-0.nix b/clusters/k2/k2-0.nix index eceaa14..3613065 100644 --- a/clusters/k2/k2-0.nix +++ b/clusters/k2/k2-0.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/b3cb0342-3f23-4744-b7d5-81bfe796f7dc"; + { device = "/dev/disk/by-uuid/538136b2-8d66-4269-ba9d-03d9c4753670"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4347-5916"; + { device = "/dev/disk/by-uuid/4122-992F"; fsType = "vfat"; }; diff --git a/clusters/k2/k2-1.nix b/clusters/k2/k2-1.nix index ab7f774..979f8d5 100644 --- a/clusters/k2/k2-1.nix +++ b/clusters/k2/k2-1.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d005e166-d50f-4633-9077-d77ca026aedf"; + { device = "/dev/disk/by-uuid/9a8d3dae-d0e9-4af1-8eb0-a700cbd483c3"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4975-538E"; + { device = "/dev/disk/by-uuid/42A8-FFF9"; fsType = "vfat"; }; diff --git a/clusters/k2/k2-2.nix b/clusters/k2/k2-2.nix index 1ed2fda..ae4a935 100644 --- a/clusters/k2/k2-2.nix +++ b/clusters/k2/k2-2.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/51062251-ae44-4b4d-9173-9c1c60b9a3ce"; + { device = "/dev/disk/by-uuid/43f630c2-faeb-44bf-8978-9832de9a2122"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5128-B89C"; + { device = "/dev/disk/by-uuid/43BB-4E5C"; fsType = "vfat"; }; diff --git a/clusters/k2/k2-3.nix b/clusters/k2/k2-3.nix index 8bee80a..d830121 100644 --- a/clusters/k2/k2-3.nix +++ b/clusters/k2/k2-3.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a5826589-d7c9-4bf2-a7cc-1b67d977c36a"; + { device = "/dev/disk/by-uuid/402e3cc9-fab6-44b8-aeb9-62aac9a3712d"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/584C-7A39"; + { device = "/dev/disk/by-uuid/4476-D001"; fsType = "vfat"; }; diff --git a/clusters/k2/k2-4.nix b/clusters/k2/k2-4.nix index daabb59..d0dc905 100644 --- a/clusters/k2/k2-4.nix +++ b/clusters/k2/k2-4.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/04723aab-39c3-42ff-9714-b169de0c9e9c"; + { device = "/dev/disk/by-uuid/663b0ba7-962a-4ec2-b0cd-09472a03f6dd"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5D50-B9DF"; + { device = "/dev/disk/by-uuid/45CE-83A2"; fsType = "vfat"; }; diff --git a/clusters/k2/k2-5.nix b/clusters/k2/k2-5.nix deleted file mode 100644 index e380fbb..0000000 --- a/clusters/k2/k2-5.nix +++ /dev/null @@ -1,21 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: - -{ - imports = [ ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/6b3a3c7b-b8dc-4274-a189-21fbe4d8a488"; - fsType = "ext4"; - }; - - swapDevices = [ ]; - - nix.maxJobs = lib.mkDefault 1; -}