Merge branch 'pr/bump-vmd32387' into 'master'

Pr/bump vmd32387

See merge request steveeJ/infra!57

nix/os/containers/backup.nix

@@ -46,7 +46,7 @@ let
       script = ''
         export PATH="$PATH:/run/wrappers/bin"
         exec rclone --config ${wasabiRc pkgs} mount wasabi-${bucket}:${bucket} ${bkpDestination} \
-                    --stats=1m --stats-log-level=NOTICE \
+                    --stats=50m --stats-log-level=NOTICE \
                     --cache-dir=${cacheDir} \
                     --vfs-cache-mode=full
 
@@ -105,7 +105,7 @@ in {
         echo Starting rclone sync...
         rclone --config ${wasabiRc pkgs} sync \
           ${bkpDestination}/rdedup/ wasabi-${bucket}:${bucket}/rdedup/  \
-            --stats=1m --stats-log-level=NOTICE
+            --stats=50m --stats-log-level=WARNING
         echo Finished rclone sync...
       '';
     };
@@ -162,11 +162,12 @@ in {
       enable = true;
       wantedBy = [ "timer.target" "multi-user.target" ];
       timerConfig = {
-        OnCalendar = "23:00";
+        # Obtained using `systemd-analyze calendar "Wed 23:00"`
+        # OnCalendar = "Wed *-*-* 23:00:00";
+        OnStartupSec="2d";
         Unit = "bkp-sync-rclone.service";
-        # OnActiveSec="1s";
-        # OnUnitInactiveSec="12h";
-        # AccuracySec="5s";
+        OnUnitInactiveSec="2d";
+        Persistent="true";
       };
     };
   };

nix/os/devices/vmd32387.contaboserver.net/system.nix

@@ -77,6 +77,10 @@ in {
     };
   };
 
+  nix.gc = {
+    automatic = true;
+  };
+
   boot.initrd.network = {
     enable = true;
     udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ];

nix/os/devices/vmd32387.contaboserver.net/versions.nix

@@ -1,20 +1,20 @@
 {
   channelsNixosStable = {
     ref = "nixos-20.03";
-    rev = "252bfe0107587d40092057f338e9ffcf7bbd90cb";
+    rev = "ff6fda61600cc60404bab5cb6b18b8636785b7bc";
   };
   channelsNixosUnstable = {
     ref = "nixos-unstable";
-    rev = "e0759a49733dfc3aa225b8a7423c00da6e1ecb67";
+    rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
   };
   nixpkgsMaster = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "master";
-    rev = "00bf6abad17bd07c29576f382d77797a973f3be1";
+    rev = "50e986ba967811afdb5edb3b6eda4369059e4238";
   };
   homeManagerModule = {
     url = "https://github.com/rycee/home-manager";
     ref = "release-20.03";
-    rev = "4a8d6280544d9b061c0b785d2470ad6eeda47b02";
+    rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
   };
 }