From 3de2cceef4c0c7f9ac3702d894cbacba175716d2 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Mon, 8 Aug 2016 23:03:04 +0200
Subject: [PATCH] =?UTF-8?q?le=20monitoring=20est=20regroup=C3=A9=20dans=20?=
 =?UTF-8?q?un=20fichier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/monitoring.nix | 15 +++++++++------
 base/services.nix   |  8 --------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/base/monitoring.nix b/base/monitoring.nix
index 332f7bb..d754594 100644
--- a/base/monitoring.nix
+++ b/base/monitoring.nix
@@ -1,11 +1,14 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 
 {
-  ## Munin server -- generate /var/www/munin
+  # Monitoring
+
+  # Noeud de supervision munin = pas de stockage des données locales
+  services.munin-node = {
+    enable = true;
+  };
+
+  # Munin server -- generate /var/www/munin
   services.munin-cron = {
     enable = true;
     hosts = ''
@@ -13,7 +16,7 @@
         address localhost
     '';
     extraGlobalConfig = ''
-      contact.email.command mail -s "Munin notification for ''${var:host}" hostmaster@prunetwork.fr
+      contact.email.command mail -s "Munin notification for ''${var:host}" root@${config.networking.hostName}
     '';
   };
 
diff --git a/base/services.nix b/base/services.nix
index 667c707..1609c6c 100644
--- a/base/services.nix
+++ b/base/services.nix
@@ -27,12 +27,4 @@
       UsePrivilegeSeparation sandbox
     '';
   };
-
-  # Monitoring
-
-  ## Noeud de supervision munin = pas de stockage des données locales
-
-  services.munin-node = {
-    enable = true;
-  };
 }