From ab8f306d7c2c49b8116e1af7b355ed2384617ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 12 Dec 2019 00:24:23 +0100
Subject: Add specification for the private config file as a module.

---
 modules/private/monitoring/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/private/monitoring/default.nix')

diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index e44b127..d6c91ac 100644
--- a/modules/private/monitoring/default.nix
+++ b/modules/private/monitoring/default.nix
@@ -1,4 +1,4 @@
-{ config, myconfig, pkgs, lib, name, hostFQDN, ... }:
+{ config, pkgs, lib, name, ... }:
 let
   myplugins = pkgs.runCommand "buildplugins" {
     buildInputs = [ pkgs.makeWrapper pkgs.perl ];
@@ -38,7 +38,7 @@ let
     };
   };
   commonObjects = pkgs.callPackage ./objects_common.nix ({
-    inherit hostFQDN;
+    hostFQDN = config.hostEnv.FQDN;
     sudo = "/run/wrappers/bin/sudo";
   } // builtins.getAttr name commonConfig);
   hostObjects =
@@ -113,7 +113,7 @@ in
       enable = true;
       mode = "0644";
       user = "root";
-      text = "MAILADDR ${myconfig.env.monitoring.email}";
+      text = "MAILADDR ${config.myEnv.monitoring.email}";
     };
 
     # needed since extraResource is not in the closure
@@ -125,15 +125,15 @@ in
         use_syslog=1
         log_initial_states=1
         date_format=iso8601
-        admin_email=${myconfig.env.monitoring.email}
+        admin_email=${config.myEnv.monitoring.email}
 
         obsess_over_services=1
         ocsp_command=notify-master
       '';
       extraResource = ''
         $USER2$=${myplugins}
-        $USER200$=${myconfig.env.monitoring.status_url}
-        $USER201$=${myconfig.env.monitoring.status_token}
+        $USER200$=${config.myEnv.monitoring.status_url}
+        $USER201$=${config.myEnv.monitoring.status_token}
       '';
       objectDefs = toObjects commonObjects + toObjects hostObjects;
     };
-- 
cgit v1.2.3