Change monitoring for tiboqorl

[perso/Immae/Config/Nix.git] / modules / private / monitoring / status.nix

diff --git a/modules/private/monitoring/status.nix b/modules/private/monitoring/status.nix
index 73f474926f5de1f147d99ecc382c6cfaec0f5cbf..682f5df824e8623aa680861d42a43a05a03141a2 100644 (file)
--- a/modules/private/monitoring/status.nix
+++ b/modules/private/monitoring/status.nix
@@ -12,17 +12,14 @@
     };
   };
   config = lib.mkIf config.myServices.status.enable {
-    secrets.keys = [
-      {
-        dest = "naemon-status/environment";
-        user = "naemon";
-        group = "naemon";
-        permission = "0400";
-        text = ''
-          TOKENS=${builtins.concatStringsSep " " config.myEnv.monitoring.nrdp_tokens}
-          '';
-      }
-    ];
+    secrets.keys."naemon-status/environment" = {
+      user = "naemon";
+      group = "naemon";
+      permissions = "0400";
+      text = ''
+        TOKENS=${builtins.concatStringsSep " " config.myEnv.monitoring.nrdp_tokens}
+        '';
+    };
     services.nginx = {
       enable = true;
       recommendedOptimisation = true;
@@ -32,12 +29,6 @@
       upstreams."netdata".extraConfig = ''
         keepalive 64;
         '';
-      virtualHosts."status.eban.bzh" = {
-        acmeRoot = config.myServices.certificates.webroot;
-        useACMEHost = name;
-        forceSSL = true;
-        locations."/".proxyPass = "http://unix:/run/naemon-status/socket.sock:/";
-      };
       virtualHosts."status.immae.eu" = {
         acmeRoot = config.myServices.certificates.webroot;
         useACMEHost = name;
@@ -65,9 +56,7 @@
       };
     };
     security.acme.certs."${name}" = {
-      extraDomains."status.immae.eu" = null;
-      extraDomains."status.eban.bzh" = null;
-      user = config.services.nginx.user;
+      extraDomainNames = [ "status.immae.eu" ];
       group = config.services.nginx.group;
     };
 
@@ -83,7 +72,7 @@
         Type = "simple";
         WorkingDirectory = "${./status}";
         ExecStart = let
-          python = pkgs.python3.withPackages (p: [ p.gunicorn p.flask p.flask_login ]);
+          python = pkgs.python38.withPackages (p: [ p.gunicorn p.flask p.flask_login ]);
         in
           "${python}/bin/gunicorn -w4 --bind unix:/run/naemon-status/socket.sock app:app";
         User = "naemon";