diff options
| author | tv <tv@shackspace.de> | 2015-10-01 14:59:58 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-01 14:59:58 +0200 |
| commit | 24326956780833540fd65dd0cb750c1071fa51b9 (patch) | |
| tree | fdf2a14c654d2c4e5154e8d7742557f8bbb3c4bc | |
| parent | 3384dd0a5578cc3a26dd076669dd264f5ae9f008 (diff) | |
krebs lib.types: deprecate host.infest.{addr,port}
| -rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
| -rw-r--r-- | 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 5e8cdc639..7d4bf1df4 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 0aa594fb1..039f803ef 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."; }; }; |