From 24dd2cce4f92dd7d5586b216ddb7a351acc2cba7 Mon Sep 17 00:00:00 2001
From: Vivian <vivian@0x76.dev>
Date: Tue, 2 Jan 2024 10:22:52 +0100
Subject: [PATCH] add disk

---
 nixos/hosts/hades/storage/configuration.nix   |  5 ++---
 nixos/hosts/hades/storage/fs.nix              | 16 ++++++++------
 nixos/hosts/olympus/dhcp/configuration.nix    | 21 +++++++++++--------
 .../olympus/victoriametrics/configuration.nix | 14 ++++++-------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/nixos/hosts/hades/storage/configuration.nix b/nixos/hosts/hades/storage/configuration.nix
index 4949038f..fc4506fb 100644
--- a/nixos/hosts/hades/storage/configuration.nix
+++ b/nixos/hosts/hades/storage/configuration.nix
@@ -24,8 +24,7 @@
       parityFiles =
         [
         "/mnt/parity1/snapraid.parity"
-        "/mnt/parity2/snapraid.parity-2"
-        "/mnt/parity3/snapraid.parity-3"
+        "/mnt/parity2/snapraid.parity"
         ];
       dataDisks = {
         d1 = "/mnt/disk1";
@@ -34,6 +33,7 @@
         d4 = "/mnt/disk4";
         d5 = "/mnt/disk5";
         d6 = "/mnt/disk6";
+        d7 = "/mnt/disk7";
       };
       contentFiles = [
         "/var/lib/snapraid/snapraid.content"
@@ -52,7 +52,6 @@
         "/torrents/"
         "/exclusion-zone/"
         "/roms/"
-        "/roms/"
       ];
     };
   };
diff --git a/nixos/hosts/hades/storage/fs.nix b/nixos/hosts/hades/storage/fs.nix
index 27aec097..6e63cfca 100644
--- a/nixos/hosts/hades/storage/fs.nix
+++ b/nixos/hosts/hades/storage/fs.nix
@@ -1,6 +1,10 @@
 { pkgs, ... }: {
 
-  environment.systemPackages = with pkgs; [ mergerfs mergerfs-tools smartmontools ];
+  environment.systemPackages = with pkgs; [
+    mergerfs
+    mergerfs-tools
+    smartmontools
+  ];
   fileSystems = {
     "/mnt/disk1" = {
       fsType = "ext4";
@@ -32,17 +36,17 @@
       device = "/dev/disk/by-uuid/63381321-fe00-4838-8668-4d1decc94296";
     };
 
+    "/mnt/disk7" = {
+      fsType = "ext4";
+      device = "/dev/disk/by-uuid/6c568887-9d2e-45ce-ab85-4c48cca2226a";
+    };
+
     "/mnt/parity1" = {
       fsType = "ext4";
       device = "/dev/disk/by-partuuid/7c9b88ed-b8f8-40c9-bbc3-b75d30e04e01";
     };
 
     "/mnt/parity2" = {
-      fsType = "ext4";
-      device = "/dev/disk/by-uuid/6c568887-9d2e-45ce-ab85-4c48cca2226a";
-    };
-
-    "/mnt/parity3" = {
       fsType = "ext4";
       device = "/dev/disk/by-partuuid/5d2d7e3e-3730-4d9b-8759-dc14396f3357";
     };
diff --git a/nixos/hosts/olympus/dhcp/configuration.nix b/nixos/hosts/olympus/dhcp/configuration.nix
index 0503693b..a2c642bd 100644
--- a/nixos/hosts/olympus/dhcp/configuration.nix
+++ b/nixos/hosts/olympus/dhcp/configuration.nix
@@ -34,11 +34,14 @@ in
 
   networking.firewall.allowedUDPPorts = [ 67 ];
 
-  # services.prometheus.exporters.kea = {
-  #   enable = true;
-  #   openFirewall = true;
-  #   controlSocketPaths = [ "/run/kea/kea-dhcp4.socket" ];
-  # };
+  services.prometheus.exporters.kea = {
+    enable = false;
+    openFirewall = true;
+    user = "kea";
+    controlSocketPaths = [ "/tmp/kea-dhcp4.socket" ];
+  };
+
+  # To make sure the control socket is accesible
 
   services.kea.dhcp4 = {
     enable = true;
@@ -50,10 +53,10 @@ in
 
       interfaces-config.interfaces = [ "eth0" ];
 
-      # control-socket = {
-      #   socket-type = "unix";
-      #   socket-name = "/run/kea/kea-dhcp4.socket";
-      # };
+      control-socket = {
+        socket-type = "unix";
+        socket-name = "/tmp/kea-dhcp4.socket";
+      };
       # failed to initialize Kea server: configuration error using file '/etc/kea/dhcp4-server.conf': cannot create socket lockfile, /run/kea/kea-dhcp4.socket.lock, : No such file or directory
 
       lease-database = {
diff --git a/nixos/hosts/olympus/victoriametrics/configuration.nix b/nixos/hosts/olympus/victoriametrics/configuration.nix
index 8ad22cb4..93573b84 100644
--- a/nixos/hosts/olympus/victoriametrics/configuration.nix
+++ b/nixos/hosts/olympus/victoriametrics/configuration.nix
@@ -38,13 +38,13 @@ in {
           scrape_timeout = "30s";
         };
         scrape_configs = [
-          {
-            job_name = "kea";
-            static_configs = [{
-              targets = [ "dhcp.olympus:9547" ];
-              labels.app = "dhcp";
-            }];
-          }
+          # {
+          #   job_name = "kea";
+          #   static_configs = [{
+          #     targets = [ "dhcp.olympus:9547" ];
+          #     labels.app = "dhcp";
+          #   }];
+          # }
           {
             job_name = "nginx";
             static_configs = [{