From 24326956780833540fd65dd0cb750c1071fa51b9 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 1 Oct 2015 14:59:58 +0200
Subject: krebs lib.types: deprecate host.infest.{addr,port}

---
 krebs/3modules/default.nix | 2 --
 krebs/4lib/types.nix       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 5e8cdc63..7d4bf1df 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -527,7 +527,6 @@ let
       mkdir = rec {
         cores = 1;
         dc = "tv"; #dc = "cac";
-        infest.addr = head nets.internet.addrs4;
         nets = rec {
           internet = {
             addrs4 = ["104.233.84.215"];
@@ -614,7 +613,6 @@ let
       rmdir = rec {
         cores = 1;
         dc = "tv"; #dc = "cac";
-        infest.addr = head nets.internet.addrs4;
         nets = rec {
           internet = {
             addrs4 = ["104.233.84.70"];
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 0aa594fb..039f803e 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -31,10 +31,13 @@ types // rec {
       infest = {
         addr = mkOption {
           type = str;
+          apply = trace "Obsolete option `krebs.hosts.${config.name}.infest.addr' is used.  It was replaced by the `target' argument to `make` or `get`.  See Makefile for more information.";
         };
         port = mkOption {
           type = int;
           default = 22;
+          # TODO replacement: allow target with port, SSH-style: [lol]:666
+          apply = trace "Obsolete option `krebs.hosts.${config.name}.infest.port' is used.  It's gone without replacement.";
         };
       };
 
-- 
cgit v1.2.3