diff options
author | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
commit | db72d5911f1556d3b1cfbe8f1a2d8f6765728952 (patch) | |
tree | ab12aafd2994c265cd4fd604e554b2e8db2da021 /krebs/3modules/tv | |
parent | 64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b (diff) | |
parent | 8c859335a879c515a1415bc8b15b5cb7eb519efc (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/tv')
-rw-r--r-- | krebs/3modules/tv/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 533502914..a0237d361 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -104,7 +104,7 @@ with config.krebs.lib; ire 60 IN A ${elemAt nets.internet.addrs4 0} ''; }; - nets = { + nets = rec { internet = { addrs4 = ["198.147.22.115"]; aliases = [ @@ -115,6 +115,7 @@ with config.krebs.lib; ssh.port = 11423; }; retiolum = { + via = internet; addrs4 = ["10.243.231.66"]; addrs6 = ["42:b912:0f42:a82d:0d27:8610:e89b:490c"]; aliases = [ @@ -286,7 +287,10 @@ with config.krebs.lib; nets = { gg23 = { addrs4 = ["10.23.1.37"]; - aliases = ["wu.gg23"]; + aliases = [ + "wu.gg23" + "cache.wu.gg23" + ]; ssh.port = 11423; }; retiolum = { |