summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-27 17:28:46 +0100
committerlassulus <lass@aidsballs.de>2016-02-27 17:28:46 +0100
commit024de57e7b1918a617685b65a0c5c45ee4592e47 (patch)
tree2f0a9168b4569650619f334b597733ae10216b66 /krebs/3modules/tv
parentacd5d7cceeeb96c182a963ba0c564821a36c8938 (diff)
parent8c859335a879c515a1415bc8b15b5cb7eb519efc (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/tv')
-rw-r--r--krebs/3modules/tv/default.nix8
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 = {