From 739d28eaf8cb226f74a7e7f5ad31fb152a90ee4b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 17 Jan 2020 01:15:21 +0100
Subject: [PATCH] Remove mail command in backup script

---
 modules/private/environment.nix     |  1 -
 modules/private/system/backup-2.nix |  1 -
 modules/rsync_backup/default.nix    | 14 +++-----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/private/environment.nix b/modules/private/environment.nix
index 7da2480..ffb61c5 100644
--- a/modules/private/environment.nix
+++ b/modules/private/environment.nix
@@ -420,7 +420,6 @@ in
         '';
       type = submodule {
         options = {
-          mailto = mkOption { type = str; description = "Where to e-mail on error"; };
           ssh_key = mkOption {
             description = "SSH key information";
             type = submodule {
diff --git a/modules/private/system/backup-2.nix b/modules/private/system/backup-2.nix
index 1d84667..4e24c12 100644
--- a/modules/private/system/backup-2.nix
+++ b/modules/private/system/backup-2.nix
@@ -50,7 +50,6 @@
 
   services.rsyncBackup = {
     mountpoint = "/backup2";
-    mailto = config.myEnv.rsync_backup.mailto;
     profiles = config.myEnv.rsync_backup.profiles;
     ssh_key_public = config.myEnv.rsync_backup.ssh_key.public;
     ssh_key_private = config.myEnv.rsync_backup.ssh_key.private;
diff --git a/modules/rsync_backup/default.nix b/modules/rsync_backup/default.nix
index dadf5e7..a2ef0fd 100644
--- a/modules/rsync_backup/default.nix
+++ b/modules/rsync_backup/default.nix
@@ -84,19 +84,16 @@ let
 
   ssh_key = config.secrets.fullPaths."rsync_backup/identity";
 
-  backup_head = mailto: ''
+  backup_head = ''
     #!${pkgs.stdenv.shell}
     EXCL_FROM=`mktemp`
     FILES_FROM=`mktemp`
     TMP_STDERR=`mktemp`
 
     on_exit() {
-    ${lib.optionalString (mailto != null) ''
-      MAILTO="${mailto}"
       if [ -s "$TMP_STDERR" ]; then
-        cat "$TMP_STDERR" | ${pkgs.mailutils}/bin/mail -s "save_distant rsync error" "$MAILTO"
+        cat "$TMP_STDERR"
       fi
-    ''}
       rm -f $TMP_STDERR $EXCL_FROM $FILES_FROM
     }
 
@@ -186,11 +183,6 @@ in
       type = lib.types.path;
       description = "Path to the base folder for backups";
     };
-    mailto = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-      description = "E-mail to send the report to";
-    };
     profiles = lib.mkOption {
       type = lib.types.attrsOf profileModule;
       default = {};
@@ -223,7 +215,7 @@ in
 
     services.cron.systemCronJobs = let
       backup = pkgs.writeScript "backup.sh" (builtins.concatStringsSep "\n" ([
-        (backup_head cfg.mailto)
+        backup_head
       ] ++ lib.mapAttrsToList backup_profile cfg.profiles));
     in [
       ''
-- 
2.41.0