From 9efe536e453b4f52112dd436edb916fca1e40149 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 17 Oct 2015 18:31:27 +0200 Subject: cd: claim cgit.cd.krebsco.de --- krebs/3modules/tv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 49204c74f..d0e3a6770 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -21,9 +21,10 @@ with import ../../4lib { inherit lib; }; addrs4 = ["162.219.7.216"]; aliases = [ "cd.internet" + "cd.krebsco.de" + "cgit.cd.krebsco.de" "cd.viljetic.de" "cgit.cd.viljetic.de" - "cd.krebsco.de" ]; ssh.port = 11423; }; -- cgit v1.2.3 From 5d0e4243bfed1a5bf12d06d9f492150b3ba68988 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 17 Oct 2015 21:21:13 +0200 Subject: krebs 3 makefu: remove retard entries for pigstarter --- krebs/3modules/makefu/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index b958514cc..4628b2acc 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -129,12 +129,9 @@ with import ../../4lib { inherit lib; }; euer IN MX 1 aspmx.l.google.com. io IN NS pigstarter.krebsco.de. pigstarter IN A ${head nets.internet.addrs4} - conf IN A ${head nets.internet.addrs4} gold IN A ${head nets.internet.addrs4} - graph IN A ${head nets.internet.addrs4} tinc IN A ${head nets.internet.addrs4} - boot IN A ${head nets.internet.addrs4} - mx42 IN A ${head nets.internet.addrs4}''; + boot IN A ${head nets.internet.addrs4}''; }; nets = { internet = { -- cgit v1.2.3 From 9f4f51b1c7adcf483d27def37a074556fdf692ab Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 17 Oct 2015 21:32:59 +0200 Subject: cd,ire: add extraZones --- krebs/3modules/tv/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'krebs/3modules') 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 = ; 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 = { -- cgit v1.2.3 From c9a3d1a3d9c59e52a7866d7a947ee01a117548e3 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 17 Oct 2015 21:42:03 +0200 Subject: tv extraZones: set TTL to 60 --- krebs/3modules/tv/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'krebs/3modules') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index eb7a85707..f5ec854c9 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -13,11 +13,11 @@ with import ../../4lib { inherit lib; }; 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} - cgit IN A ${elemAt nets.internet.addrs4 0} - cgit.cd IN A ${elemAt nets.internet.addrs4 0} + krebsco.de. 60 IN MX 5 mx23 + mx23 60 IN A ${elemAt nets.internet.addrs4 0} + cd 60 IN A ${elemAt nets.internet.addrs4 0} + cgit 60 IN A ${elemAt nets.internet.addrs4 0} + cgit.cd 60 IN A ${elemAt nets.internet.addrs4 0} ''; }; nets = rec { @@ -97,7 +97,7 @@ with import ../../4lib { inherit lib; }; 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} + ire 60 IN A ${elemAt nets.internet.addrs4 0} ''; }; nets = { -- cgit v1.2.3