Upgrade stokes to 21.05

clusters/stokes/cluster.nix

@@ -4,9 +4,35 @@ let
   cfg = config.node;
 
   configuration = {
+    boot = {
+      loader.systemd-boot.enable = true;
+      loader.efi.canTouchEfiVariables = true;
+      kernelPackages = pkgs.linuxPackages_5_4;
+      kernelModules = [ "ib_umad" "ib_ipoib" ];
+      kernelParams = [
+        "console=ttyS0,115200"
+        "console=tty0"
+      ];
+    };
+
+
+    console = {
+      font = "Lat2-Terminus16";
+      keyMap = "us";
+    };
+
+    i18n = {
+      defaultLocale = "en_DK.UTF-8";
+      extraLocaleSettings = {
+        LC_TIME = "en_DK.UTF-8";
+      };
+    };
+
+    time.timeZone = "Europe/Oslo";
+
     features = {
       os = {
-        boot.uefi = true;
+        # boot.uefi = true;
         adminAuthorizedKeys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDULdlLC8ZLu9qBZUYsjhpr6kv5RH4yPkekXQdD7prkqapyoptUkO1nOTDwy7ZsKDxmp9Zc6OtdhgoJbowhGW3VIZPmooWO8twcaYDpkxEBLUehY/n8SlAwBtiHJ4mTLLcynJMVrjmTQLF3FeWVof0Aqy6UtZceFpLp1eNkiHTCM3anwtb9+gfr91dX1YsAOqxqv7ooRDu5rCRUvOi4OvRowepyuBcCjeWpTkJHkC9WGxuESvDV3CySWkGC2fF2LHkAu6SFsFE39UA5ZHo0b1TK+AFqRFiBAb7ULmtuno1yxhpBxbozf8+Yyc7yLfMNCyBpL1ci7WnjKkghQv7yM1xN2XMJLpF56v0slSKMoAs7ThoIlmkRm/6o3NCChgu0pkpNg/YP6A3HfYiEDgChvA6rAHX6+to50L9xF3ajqk4BUzWd/sCk7Q5Op2lzj31L53Ryg8vMP8hjDjYcgEcCCsGOcjUVgcsmfC9LupwRIEz3aF14AWg66+3zAxVho8ozjes= jonas.juselius@juselius.io"
@@ -74,14 +100,6 @@ let
 
     systemd.services."serial-getty@ttyS0".enable = true;
 
-    boot = {
-      kernelModules = [ "ib_umad" "ib_ipoib" ];
-      kernelParams = [
-        "console=ttyS0,115200"
-        "console=tty0"
-      ];
-    };
-
     nix = {
       maxJobs = 32;
       # binaryCachePublicKeys = [
@@ -95,7 +113,9 @@ let
   };
 
   i40efix = {
-    boot = let kernelExtras = pkgs.callPackage ./kernel.nix {}; in {
+    boot = let kernelExtras = pkgs.callPackage ./kernel.nix {
+      kernel = pkgs.linuxPackages_5_4.kernel;
+    }; in {
       extraModulePackages = [ kernelExtras.i40e2 ];
       kernelModules = [ "ib_umad" "ib_ipoib" "i40e2" ];
     };

clusters/stokes/default.nix

@@ -3,6 +3,13 @@ let
     node.address = "10.1.62.2";
     node.myvnc = true;
 
+    systemd.targets = {
+      sleep.enable = false;
+      suspend.enable = false;
+      hibernate.enable = false;
+      hybrid-sleep.enable = false;
+    };
+
     features = {
       os = {
         externalInterface = "eno1";
@@ -71,6 +78,7 @@ let
     };
 
     networking = {
+      useDHCP = false;
       interfaces.eno1 = {
         useDHCP = false;
         ipv4.addresses = [ {
@@ -148,7 +156,7 @@ let
           enableACME = true;
           serverAliases = [];
           locations."/" = {
-            proxyPass = "http://127.0.0.1:9088";
+            proxyPass = "http://localhost:9088";
             proxyWebsockets = false;
             extraConfig = ''
               allow 10.1.2.0/24;
@@ -203,6 +211,7 @@ let
               i40efix = true;
             };
             networking = {
+              useDHCP = false;
               interfaces.eno33 = {
                 useDHCP = false;
                 ipv4.addresses = [ {

clusters/stokes/kernel.nix

@@ -1,4 +1,4 @@
-{pkgs, stdenv, fetchurl, config, kernel ? pkgs.linux, ...}:
+{pkgs, lib, stdenv, fetchurl, config, kernel ? pkgs.linux, ...}:
 let
   i40e =
     stdenv.mkDerivation rec {
@@ -33,14 +33,14 @@ let
       meta = {
         description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)";
         homepage = https://github.com/dmarion/i40e;
-        license = stdenv.lib.licenses.gpl2;
+        license = lib.licenses.gpl2;
       };
     };
 in
 {
   i40e2 = i40e;
   overlay = self: super: {
-    linuxPackages = super.linuxPackages // { inherit i40e; };
+    linuxPackages_5_4 = super.linuxPackages_5_4 // { inherit i40e; };
   };
 }