Fix converse

[perso/Immae/Config/Nix.git] / modules / private / system / monitoring-1.nix

diff --git a/modules/private/system/monitoring-1.nix b/modules/private/system/monitoring-1.nix
index 2198d09fc3f480b7045284d3f2019ff1c3ff4a91..c45835f1616bb124ab2e9f5c14216a1e59164884 100644 (file)
--- a/modules/private/system/monitoring-1.nix
+++ b/modules/private/system/monitoring-1.nix
@@ -1,13 +1,14 @@
-{ privateFiles }:
-{ config, pkgs, resources, ... }:
+{ config, pkgs, lib, resources, ... }:
 {
   deployment = {
     targetUser = "root";
-    targetHost = config.hostEnv.ips.main.ip4;
+    targetHost = lib.head config.hostEnv.ips.main.ip4;
     substituteOnDestination = true;
   };
+  # ssh-keyscan monitoring-1 | nix-shell -p ssh-to-age --run ssh-to-age
+  secrets.ageKeys = [ "age1dn4lzhgxusqrpjjnzm7w8ml39ptf326htuzmpqdqs2gg3wq7cqzqxuvx8k" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; };
+  myEnv = import ../../../nixops/secrets/environment.nix;
 
   imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ] ++ builtins.attrValues (import ../..);
 
@@ -16,9 +17,9 @@
   myServices.status.enable = true;
   networking = {
     firewall.enable = true;
-    interfaces."ens3".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList
-      (n: ips: { address = ips.ip4; prefixLength = 32; })
-      (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.hostEnv.ips);
+    interfaces."ens3".ipv4.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList
+      (n: ips: map (ip: { address = ip; prefixLength = 32; }) (ips.ip4 or []))
+      (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.hostEnv.ips));
     interfaces."ens3".ipv6.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList
       (n: ips: map (ip: { address = ip; prefixLength = (if n == "main" && ip == pkgs.lib.head ips.ip6 then 64 else 128); }) (ips.ip6 or []))
       config.hostEnv.ips);
@@ -36,17 +37,16 @@
   ];
 
   services.netdata.enable = true;
+  services.netdata.configDir."stream.conf" = config.secrets.fullPaths."netdata-stream.conf";
   services.netdata.config.web."allow dashboard from" = "localhost";
   services.netdata.config.web."allow badges from" = "*";
   services.netdata.config.web."allow streaming from" = "*";
   services.netdata.config.web."allow netdata.conf from" = "fd*";
   services.netdata.config.web."allow management from" = "fd*";
   networking.firewall.allowedTCPPorts = [ 19999 ];
-  environment.etc."netdata/stream.conf".source = "/var/secrets/netdata-stream.conf";
 
-  secrets.keys = [
-    {
-      dest = "netdata-stream.conf";
+  secrets.keys = {
+    "netdata-stream.conf" = {
       user = config.services.netdata.user;
       group = config.services.netdata.group;
       permissions = "0400";
@@ -57,8 +57,8 @@
             default memory = ram
             health enabled by default = auto
       '') config.myEnv.monitoring.netdata_keys);
-    }
-  ];
+    };
+  };
   users.users."${config.services.netdata.user}".extraGroups = [ "keys" ];
   # This value determines the NixOS release with which your system is
   # to be compatible, in order to avoid breaking some software such as