From affb69250d13f64d2be14327c1b47d23cadcb987 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 17 Apr 2016 04:13:32 +0200
Subject: krebs.backup network-ssh-port: fail if cannot find port

---
 krebs/3modules/backup.nix  | 9 ++++++---
 krebs/3modules/default.nix | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 1e926429..e85a3dfa 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -120,11 +120,11 @@ let
         dst_exec() {
           exec ssh -F /dev/null \
               -i "$identity" \
-              ''${dst_port:+-p $dst_port} \
+              -p $dst_port \
               "$dst_user@$dst_host" \
               -T "exec$(printf ' %q' "$@")"
         }
-        rsh="ssh -F /dev/null -i $identity ''${dst_port:+-p $dst_port}"
+        rsh="ssh -F /dev/null -i $identity -p $dst_port"
         local_rsync() {
           rsync "$@"
         }
@@ -146,7 +146,7 @@ let
         dst_exec() {
           exec "$@"
         }
-        rsh="ssh -F /dev/null -i $identity ''${src_port:+-p $src_port}"
+        rsh="ssh -F /dev/null -i $identity -p $src_port"
         local_rsync() {
           mkdir -m 0700 -p ${shell.escape plan.dst.path}/current
           flock -n ${shell.escape plan.dst.path} rsync "$@"
@@ -231,6 +231,9 @@ let
     ${concatStringsSep ";;\n" (mapAttrsToList
       (_: net: "(${head net.aliases}) echo ${toString net.ssh.port}")
       host.nets)};;
+    (*)
+      echo network-ssh-port: unhandled case: ${word} >&2
+      exit 1
     esac
   '';
 
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index be530d46..10c61b63 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -218,7 +218,7 @@ let
                             (filter (hasSuffix ".${cfg.search-domain}")
                                     longs);
                       add-port = a:
-                        if net.ssh.port != null
+                        if net.ssh.port != 22
                           then "[${a}]:${toString net.ssh.port}"
                           else a;
                     in
-- 
cgit v1.2.3