From 9f4f51b1c7adcf483d27def37a074556fdf692ab Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 17 Oct 2015 21:32:59 +0200
Subject: [PATCH] cd,ire: add extraZones
---
krebs/3modules/tv/default.nix | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index d0e3a6770..eb7a85707 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -11,10 +11,14 @@ with import ../../4lib { inherit lib; };
cores = 2;
dc = "tv"; #dc = "cac";
extraZones = {
+ # TODO generate krebsco.de zone from nets and don't use extraZones at all
"krebsco.de" = ''
+ krebsco.de. IN MX 5 mx23
mx23 IN A ${elemAt nets.internet.addrs4 0}
cd IN A ${elemAt nets.internet.addrs4 0}
- krebsco.de. IN MX 5 mx23'';
+ cgit IN A ${elemAt nets.internet.addrs4 0}
+ cgit.cd IN A ${elemAt nets.internet.addrs4 0}
+ '';
};
nets = rec {
internet = {
@@ -89,10 +93,20 @@ with import ../../4lib { inherit lib; };
ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICuShEqU0Cdm7KCaMD5x1D6mgj+cr7qoqbzFJDKoBbbw";
};
- ire = {
+ ire = rec {
+ extraZones = {
+ # TODO generate krebsco.de zone from nets and don't use extraZones at all
+ "krebsco.de" = ''
+ ire IN A ${elemAt nets.internet.addrs4 0}
+ '';
+ };
nets = {
internet = {
addrs4 = ["198.147.22.115"];
+ aliases = [
+ "ire.internet"
+ "ire.krebsco.de"
+ ];
ssh.port = 11423;
};
retiolum = {