Merge branch 'master' into update_22_05

systems/LoutreOS/configuration.nix

@@ -32,7 +32,10 @@
 
   services.zfs = {
     autoSnapshot.enable = true;
-    autoScrub.enable = true;
+    autoScrub = {
+      enable = true;
+      interval = "monthly";
+    };
   };
 
   hardware.usbWwan.enable = true;

systems/LoutreOS/monitoring.nix

@@ -7,7 +7,7 @@ in
   services = {
     smartd = {
       enable = true;
-      defaults.monitored = "-a -o on -s (S/../.././02|L/../../1/04)";
+      defaults.monitored = "-a -o on -s (S/../.././02|L/../15/./02)";
       notifications.mail = {
         enable = true;
         recipient = "paul@nyanlout.re";

systems/LoutreOS/services.nix

@@ -169,11 +169,6 @@ in
         readWritePaths = [ "/var/lib/postfix/queue/maildrop" ];
         postHook = ''
           ${pkgs.zfs}/bin/zfs destroy loutrepool/var/postgresql@borgsnap
-          if [[ $exitStatus == 0 ]]; then
-            ${pkgs.rclone}/bin/rclone --config /mnt/secrets/rclone_loutre.conf sync -v $BORG_REPO BackupStorage:default
-          else
-            ${backup_mail_alert}/bin/mail.sh
-          fi
         '';
       };
     };