From a0abce52e57507dd79dfea4c1305cce535c6f4da Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@tromso.serit.no>
Date: Wed, 24 Aug 2022 10:47:31 +0200
Subject: [PATCH] update frontend config

---
 configuration.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 43d35de..14926ac 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,10 +1,10 @@
 { pkgs, ...}:
 let
   nodes = import ./nixops/ekman/nodes.nix;
+  myvnc = import ./nixops/ekman/myvnc.nix { inherit pkgs; };
 in
 {
     # deployment.tags = [ "frontend" ];
-    node.myvnc = true;
 
     systemd.targets = {
       sleep.enable = false;
@@ -13,6 +13,11 @@ in
       hybrid-sleep.enable = false;
     };
 
+    cluster = {
+      compute = true;
+      k8sNode = true;
+    };
+
     features = {
       host = {
         address = "10.255.241.100";
@@ -35,7 +40,6 @@ in
 
       k8s = {
         master.enable = true;
-        node.enable = true;
         inherit nodes;
       };
 
@@ -69,8 +73,9 @@ in
         infiniband-exporter = {
           enable = true;
           nameMap = ''
-            0x0c42a10300dbe7f4 "c0-1"
-            0x0c42a10300ddc4bc "c0-2"
+            0xe8ebd3030024a2c6 "frontend"
+            0xe8ebd3030024981e "c0-1"
+            0xe8ebd3030024a21a "c0-2"
           '';
         };
         slurm-exporter = {
@@ -148,9 +153,9 @@ in
     };
 
     services.prometheus.alertmanager.configuration.global = {
-        smtp_smarthost = "smtpgw.itpartner.no:465";
-        smtp_auth_username = "utvikling";
-        smtp_auth_password = "S0m3rp0m@de#21!";
+        smtp_smarthost = "smtpgw.itpartner.no";
+        # smtp_auth_username = "utvikling";
+        # smtp_auth_password = "S0m3rp0m@de#21!";
         smtp_hello = "ekman.oceanbox.io";
         smtp_from = "noreply@ekman.oceanbox.io";
     };
@@ -217,6 +222,8 @@ in
     #   pubkeyacceptedalgorithms ssh-rsa,ssh-ed25519-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,rsa-sha2-512,rsa-sha2-256
     # '';
 
+    environment.systemPackages = [ myvnc ];
+
     imports = [ ./nixops/ekman/cluster.nix ./hardware-configuration.nix ];
   }