Remove e-mails from monitoring files

diff --git a/modules/private/monitoring/conf/contacts.cfg b/modules/private/monitoring/conf/contacts.cfg
index e088f69b21b4e5a9c6ed717434057577dedfe0ac..b6ea84d2d087e13fc2bbc06cd70e803231d61eb1 100644 (file)
--- a/modules/private/monitoring/conf/contacts.cfg
+++ b/modules/private/monitoring/conf/contacts.cfg
@@ -12,7 +12,7 @@ define contactgroup {
 #   contact_name                   immae
 #   alias                          Immae
 #   use                            generic-contact
-#   email                          ismael@bouya.org
+#   email                          xxxxxxxxxxxxxxxx
 # }
 # 
 # define contact {

diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix
index 11861ad17ef769ab25873fe9df42219d8299e46b..d99124e836da9511f957b227a34924580a27422f 100644 (file)
--- a/modules/private/monitoring/default.nix
+++ b/modules/private/monitoring/default.nix
@@ -41,7 +41,7 @@ in
       enable = true;
       mode = "0644";
       user = "root";
-      text = "MAILADDR naemon@immae.eu";
+      text = "MAILADDR ${myconfig.env.monitoring.email}";
     };
 
     # needed since extraResource is not in the closure
@@ -53,7 +53,7 @@ in
         use_syslog=1
         log_initial_states=1
         date_format=iso8601
-        admin_email=naemon@immae.eu
+        admin_email=${myconfig.env.monitoring.email}
 
         obsess_over_services=1
         ocsp_command=notify-master