From d98578e3e190463a341a94f2cc778ef886f9252d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 8 Feb 2016 01:07:03 +0100
Subject: rm krebs.build.target

---
 krebs/3modules/build.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'krebs/3modules/build.nix')

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 0da5dd38..3530fd59 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -3,8 +3,6 @@
 with lib;
 
 let
-  target = config.krebs.build // { user.name = "root"; };
-
   out = {
     # TODO deprecate krebs.build.host
     options.krebs.build.host = mkOption {
@@ -17,12 +15,6 @@ let
       default = "/nix/var/nix/profiles/system";
     };
 
-    # TODO make krebs.build.target.host :: host
-    options.krebs.build.target = mkOption {
-      type = with types; nullOr str;
-      default = null;
-    };
-
     # TODO deprecate krebs.build.user
     options.krebs.build.user = mkOption {
       type = types.user;
-- 
cgit v1.2.3


From 411aec6bf9d1b53813e693f22b77972a00ce9078 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 13 Feb 2016 16:03:40 +0100
Subject: deploy,install,populate: admit target SSH port

---
 krebs/3modules/build.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules/build.nix')

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 3530fd59..1569072d 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -51,6 +51,7 @@ let
         source = config.krebs.build.source;
         target-user = maybeEnv "target_user" "root";
         target-host = maybeEnv "target_host" config.krebs.build.host.name;
+        target-port = maybeEnv "target_port" "22";
         target-path = maybeEnv "target_path" "/var/src";
         out = ''
           #! /bin/sh
@@ -62,7 +63,8 @@ let
           }
 
           echo ${shell.escape git-script} \
-            | ssh ${shell.escape "${target-user}@${target-host}"} -T
+            | ssh -p ${shell.escape target-port} \
+                  ${shell.escape "${target-user}@${target-host}"} -T
 
           unset tmpdir
           trap '
@@ -93,6 +95,7 @@ let
                     (attrNames file-specs)} \
                   --delete \
                   -vFrlptD \
+                  -e ${shell.escape "ssh -p ${target-port}"} \
                   ${shell.escape target-path}/ \
                   ${shell.escape "${target-user}@${target-host}:${target-path}"}
         '';
-- 
cgit v1.2.3


From 673853e092c211e26a08030f87f9c868c6442a71 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 14 Feb 2016 16:43:44 +0100
Subject: RIP specialArgs.lib

---
 krebs/3modules/build.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/build.nix')

diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 1569072d..a1f44618 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with lib;
+with config.krebs.lib;
 
 let
   out = {
-- 
cgit v1.2.3