summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-10-24 14:14:58 +0200
committermakefu <github@syntax-fehler.de>2016-10-24 14:14:58 +0200
commit36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch)
treededf23acdc5763b59b5853b07dd297b88fb15636 /krebs/3modules/tv
parent3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff)
parent08c7671fc51270e582e16cbe49aa896f8bff7685 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/tv')
-rw-r--r--krebs/3modules/tv/default.nix42
1 files changed, 1 insertions, 41 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index a933cbddb..0e7535e6c 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -1,6 +1,6 @@
{ config, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
dns.providers = {
@@ -162,46 +162,6 @@ with config.krebs.lib;
};
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu";
};
- ire = {
- extraZones = {
- # TODO generate krebsco.de zone from nets and don't use extraZones at all
- "krebsco.de" = ''
- ire 60 IN A ${config.krebs.hosts.ire.nets.internet.ip4.addr}
- '';
- };
- nets = {
- internet = {
- ip4.addr = "198.147.22.115";
- aliases = [
- "ire.i"
- "ire.internet"
- "ire.krebsco.de"
- ];
- ssh.port = 11423;
- };
- retiolum = {
- via = config.krebs.hosts.ire.nets.internet;
- ip4.addr = "10.243.231.66";
- ip6.addr = "42:b912:0f42:a82d:0d27:8610:e89b:490c";
- aliases = [
- "ire.r"
- "ire.retiolum"
- ];
- tinc.pubkey = ''
- -----BEGIN RSA PUBLIC KEY-----
- MIIBCgKCAQEAwofjmP/XBf5pwsJlWklkSzI+Bo0I0B9ONc7/j+zpbmMRkwbWk4X7
- rVLt1cWvTY15ujg2u8l0o6OgEbIkc6rslkD603fv1sEAd0KOv7iKLgRpE9qfSvAt
- 6YpiSv+mxEMTpH0g36OmBfOJ10uT+iHDB/FfxmgGJx//jdJADzLjjWC6ID+iGkGU
- 1Sf+yHXF7HRmQ29Yak8LYVCJpGC5bQfWIMSL5lujLq4NchY2d+NZDkuvh42Ayr0K
- LPflnPBQ3XnKHKtSsnFR2vaP6q+d3Opsq/kzBnAkjL26jEuFK1v7P/HhNhJoPzwu
- nKKWj/W/k448ce374k5ycjvKm0c6baAC/wIDAQAB
- -----END RSA PUBLIC KEY-----
- '';
- ssh.port = 11423;
- };
- };
- ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaMjBJ/BfYlHjyn5CO0xzFNaQ0LPvMP3W9UlOs1OxGY";
- };
kaepsele = {
nets = {
internet = {