From 5e07af062d55dbeb86a29696488dfbb58a8c7344 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 6 Oct 2013 23:36:07 +0200
Subject: [PATCH] rsnapshot: do not use /etc/rsnapshot.conf

---
 modules/services/backup/rsnapshot.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/services/backup/rsnapshot.nix b/modules/services/backup/rsnapshot.nix
index e0ce97257a5..178ba3ec720 100644
--- a/modules/services/backup/rsnapshot.nix
+++ b/modules/services/backup/rsnapshot.nix
@@ -42,22 +42,24 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.rsnapshot ];
-
-    services.cron.systemCronJobs =
-      mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
-
-    environment.etc."rsnapshot.conf".source = with pkgs; writeText "gen-rsnapshot.conf" (''
+  config = mkIf cfg.enable (let
+    myRsnapshot = pkgs.rsnapshot.override { configFile = rsnapshotCfg; };
+    rsnapshotCfg = with pkgs; writeText "gen-rsnapshot.conf" (''
         config_version	1.2
         cmd_cp	${coreutils}/bin/cp
         cmd_rsync	${rsync}/bin/rsync
         cmd_ssh	${openssh}/bin/ssh
         cmd_logger	${inetutils}/bin/logger
         cmd_du	${coreutils}/bin/du
-        cmd_rsnapshot_diff	${rsnapshot}/bin/rsnapshot-diff
         lockfile	/run/rsnapshot.pid
 
-      '' + cfg.extraConfig);
-  };
+        ${cfg.extraConfig}
+      '');
+    in {
+      environment.systemPackages = [ myRsnapshot ];
+
+      services.cron.systemCronJobs =
+        mapAttrsToList (interval: time: "${time} root ${myRsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
+    }
+  );
 }