From c839c23baa37561bb3306e23fb5285e62ce9bf35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 21 May 2023 22:04:13 +0200
Subject: [PATCH] server6: enable cluster modules, add secrets

---
 flake.nix                  |  7 +++----
 hosts/server6/default.nix  | 16 ++++++++--------
 hosts/server6/secrets.yaml |  7 ++++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9e00272d..74121fc6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -666,10 +666,9 @@
         server6 = nixosSystem' {
           modules = [
             ./hosts/server6
-            # TODO
-            # self.nixosModules.cluster-network
-            # self.nixosModules.cluster
-            # skyflake.nixosModules.default
+            self.nixosModules.cluster-network
+            self.nixosModules.cluster
+            skyflake.nixosModules.default
             { _module.args = { inherit self; }; }
           ];
         };
diff --git a/hosts/server6/default.nix b/hosts/server6/default.nix
index a351e92f..dac6c335 100644
--- a/hosts/server6/default.nix
+++ b/hosts/server6/default.nix
@@ -37,15 +37,15 @@ _:
 
   simd.arch = "ivybridge"; # E5-2690 v2
 
-  # sops = {
-  #   defaultSopsFile = ./secrets.yaml;
-  #   secrets."machine-id" = {
-  #     mode = "444";
-  #     path = "/etc/machine-id";
-  #   };
-  # };
+  sops = {
+    defaultSopsFile = ./secrets.yaml;
+    secrets."machine-id" = {
+      mode = "444";
+      path = "/etc/machine-id";
+    };
+  };
 
-  # skyflake.nomad.client.meta."c3d2.cpuSpeed" = "5";
+  skyflake.nomad.client.meta."c3d2.cpuSpeed" = "5";
 
   system.stateVersion = "22.11";
 }
diff --git a/hosts/server6/secrets.yaml b/hosts/server6/secrets.yaml
index 4eb6e28e..e1fcfa3e 100644
--- a/hosts/server6/secrets.yaml
+++ b/hosts/server6/secrets.yaml
@@ -1,6 +1,7 @@
-root: ENC[AES256_GCM,data:0cmGMmyG+TT/5f5uKqwboSkBx+P0YFTypw8=,iv:z18rZcyTN4Y2PpsCDyiPW3xlfXg4eiKfguEfcaOWn1k=,tag:30BoGWmh4c47jY+XpvMxVg==,type:str]
+machine-id: ENC[AES256_GCM,data:/SlPKiJFWeVoZwE9YgDXmbCGbPmnnubmydxhSlAk+Cg=,iv:NjrupF/9qiHG+U916pq+3aM3tsQV9I5P9VUTvgcaN0w=,tag:TQAmGWIC9AQlP2qLrKnsCA==,type:str]
 #ENC[AES256_GCM,data:xpxp6eIK1DpD/7SQLh7PjAHw9NprLNt4LGoaHTqwvGRi+WQIC8GBfBhXWdWtWv7NrRTv,iv:jZEVmt/p07bEN0pfC2IRX90vw6zjjsJeS4oAy4bLRJ4=,tag:BhFGfU8zg3SUOG3Zw3FATw==,type:comment]
 luks: ENC[AES256_GCM,data:zU7Oko/uprzWZtCN8zFG+wGW2rcxCWiOYS02KuSVLJN6F50ss+fCH3j6PE4dTSKBUtTFAQq9yX4mbQHlpE7r/A==,iv:K+ycB4iQJpZP1bFONEWOLW1RSc4kaExpx9DVemvWyQI=,tag:8d9JW/pHQ56SjAcxcKqlGg==,type:str]
+root: ENC[AES256_GCM,data:0cmGMmyG+TT/5f5uKqwboSkBx+P0YFTypw8=,iv:z18rZcyTN4Y2PpsCDyiPW3xlfXg4eiKfguEfcaOWn1k=,tag:30BoGWmh4c47jY+XpvMxVg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -25,8 +26,8 @@ sops:
             VWxmV2FKNVFNZ0hjbTFsakI4dXUySU0KoP19hoQuxR9jnr+XwJqvRvAkED9rvdzg
             ocHJzgiQW2EdiZ8NTwrv5ML9YlNfj6X/BCD29oPOWyfQCf4TQTQoDg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-05-21T20:02:34Z"
-    mac: ENC[AES256_GCM,data:c8WGzgSjnPfsXpXzcaMH0stRp7j/79DK47B61srivQozRmTEo3JtEbioHyFQhmjvDU6Py4yLAPvY4tkocGCb03Z/UN/nL/DifPzycR7pNetLk4OddvAeWXbq9pKGemW17USZj+bJOPXNPNmeJrZoUA7w9Yir/irGORab5XMphiM=,iv:Do4VKS8csPPXFQiaz5LRYa9qo0dFu5CH3NeRffr1r40=,tag:uWJ7BH4lIUaYkrYcFNfbNg==,type:str]
+    lastmodified: "2023-05-21T20:03:45Z"
+    mac: ENC[AES256_GCM,data:hByMXpEmbiL54PlZLaF3dxLtq2bFUSIK4O4Ps+rcVjyIojyp+iqe+8hHkOhK43WGpbOO2RiI1M6IkADBzDuakWWVAMlrnDyyfqPNinuwg3x4QWthwEudgS7Yh9WdGOFGZMCAnekj+Y8DfYOACjk2adub60zTwzK3PBFeyTVsPnA=,iv:lOBoUfVPEmh1ryPICrKrtK9wTv3ny45BwRycmhKNe8k=,tag:fB89vtLJt7BjUqJVLoq+Eg==,type:str]
     pgp:
         - created_at: "2023-05-21T20:01:55Z"
           enc: |