From c90d5eb2988995e8e7bd387a5d1899d935882680 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Wed, 11 May 2016 20:52:49 +1000
Subject: rsnapshot module: Avoid package rebuild, pass config file explicitly.

---
 nixos/modules/services/backup/rsnapshot.nix | 48 ++++++++++-------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

(limited to 'nixos/modules/services')

diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 96657cf17fc5..05dc83372bef 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -2,7 +2,19 @@
 
 with lib;
 
-let cfg = config.services.rsnapshot;
+let 
+  cfg = config.services.rsnapshot;
+  cfgfile = pkgs.writeText "rsnapshot.conf" ''
+    config_version	1.2
+    cmd_cp	${pkgs.coreutils}/bin/cp
+    cmd_rsync	${pkgs.rsync}/bin/rsync
+    cmd_ssh	${pkgs.openssh}/bin/ssh
+    cmd_logger	${pkgs.inetutils}/bin/logger
+    cmd_du	${pkgs.coreutils}/bin/du
+    lockfile	/run/rsnapshot.pid
+
+    ${cfg.extraConfig}
+  '';
 in
 {
   options = {
@@ -39,37 +51,11 @@ in
           as retain options.
         '';
       };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.rsnapshot;
-        defaultText = "pkgs.rsnapshot";
-        example = literalExample "pkgs.rsnapshotGit";
-        description = ''
-          RSnapshot package to use.
-        '';
-      };
     };
   };
 
-  config = mkIf cfg.enable (let
-    myRsnapshot = cfg.package.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
-        lockfile	/run/rsnapshot.pid
-
-        ${cfg.extraConfig}
-      '');
-    in {
-      environment.systemPackages = [ myRsnapshot ];
-
-      services.cron.systemCronJobs =
-        mapAttrsToList (interval: time: "${time} root ${myRsnapshot}/bin/rsnapshot ${interval}") cfg.cronIntervals;
-    }
-  );
+  config = mkIf cfg.enable {
+    services.cron.systemCronJobs =
+      mapAttrsToList (interval: time: "${time} root ${pkgs.rsnapshot}/bin/rsnapshot -c ${cfgfile} ${interval}") cfg.cronIntervals;
+  };
 }
-- 
cgit 1.4.1