From acb53c23dcb11de02e642e7f99e83401531e48c1 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 20:19:40 +0200
Subject: [PATCH] populate dir: drop link-method fragments
---
krebs/default.nix | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/krebs/default.nix b/krebs/default.nix
index 5e6595ced..40b3550c8 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -203,11 +203,8 @@ let out = {
current-host = config.krebs.hosts.${current-host-name};
current-user = config.krebs.users.${current-user-name};
- target-host = config.krebs.hosts.${system};
-
methods.dir = config:
let
- can-link = config.host.name == target-host.name;
can-push = config.host.name == current-host.name;
push-method = ''
rsync \
@@ -219,13 +216,12 @@ let out = {
--delete-excluded \
-vrLptgoD \
${config.path}/ \
- root@${target}:${config.target-path}
+ ${target-url}
'';
current-url = "${current-user-name}@${current-host.name}";
source-url = "file://${config.host.name}${config.path}";
target-url = "root@${target}:${config.target-path}";
in
- #if can-link then link-method else
if can-push then push-method else
throw
# /!\ revise this message when using more than just push-method