From 1eda659c24a118bcba849beb0fbf0ac9b5d32076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 1 Dec 2022 17:02:06 +0100 Subject: kartei: add alertmanager.kmein.r alias --- kartei/kmein/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index 39125e35..d2aa8922 100644 --- a/kartei/kmein/default.nix +++ b/kartei/kmein/default.nix @@ -82,6 +82,7 @@ in "makanek.r" "makanek.kmein.r" "grafana.kmein.r" + "alertmanager.kmein.r" "names.kmein.r" "graph.r" "rrm.r" -- cgit v1.2.3 From 48ee52673e79f46e53fbfd86a9258a1a106d8ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 1 Dec 2022 19:57:54 +0100 Subject: kartei: add prometheus.kmein.r alias --- kartei/kmein/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'kartei') diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index d2aa8922..1a5a57d1 100644 --- a/kartei/kmein/default.nix +++ b/kartei/kmein/default.nix @@ -83,6 +83,7 @@ in "makanek.kmein.r" "grafana.kmein.r" "alertmanager.kmein.r" + "prometheus.kmein.r" "names.kmein.r" "graph.r" "rrm.r" -- cgit v1.2.3 From 0d19e5948545eeab67ba3cf052e396137e9cafd1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 14:52:14 +0100 Subject: krebsco.de: point apex to ni --- kartei/tv/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kartei') diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix index 428e1c3b..1d33fcad 100644 --- a/kartei/tv/default.nix +++ b/kartei/tv/default.nix @@ -171,6 +171,8 @@ in { cgit.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} search.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} search.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} + krebsco.de. 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + krebsco.de. 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} krebsco.de. 60 IN MX 5 ni krebsco.de. 60 IN TXT "v=spf1 mx -all" tv 300 IN NS ni -- cgit v1.2.3 From 7ca0326011d755d69c4306dddf9c6b44a43f5b87 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 16:58:06 +0100 Subject: krebsco.de: point apex to ponte --- kartei/krebs/default.nix | 5 +++++ kartei/tv/default.nix | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 6da73ff8..8cc292dd 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -165,6 +165,11 @@ in { ponte = { cores = 1; owner = config.krebs.users.krebs; + extraZones = { + "krebsco.de" = /* bindzone */ '' + krebsco.de. 60 IN A ${config.krebs.hosts.ponte.nets.internet.ip4.addr} + ''; + }; nets = rec { internet = { ip4 = { diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix index 1d33fcad..428e1c3b 100644 --- a/kartei/tv/default.nix +++ b/kartei/tv/default.nix @@ -171,8 +171,6 @@ in { cgit.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} search.ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} search.ni 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} - krebsco.de. 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} - krebsco.de. 60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr} krebsco.de. 60 IN MX 5 ni krebsco.de. 60 IN TXT "v=spf1 mx -all" tv 300 IN NS ni -- cgit v1.2.3 From 034c7a2d9d158522cda29bda311534ab7dc130d7 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 16:58:28 +0100 Subject: ponte: fix internet prefix --- kartei/krebs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 8cc292dd..b3af3797 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -172,9 +172,9 @@ in { }; nets = rec { internet = { - ip4 = { + ip4 = rec { addr = "141.147.36.79"; - prefix = "0.0.0.0/0"; + prefix = "${addr}/32"; }; }; retiolum = { -- cgit v1.2.3 From c2f5b1c40669b13459a170b9ec14d9a78193cef0 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 18:13:25 +0100 Subject: ponte: add internet alias --- kartei/krebs/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kartei') diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index b3af3797..e5626d92 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -176,6 +176,9 @@ in { addr = "141.147.36.79"; prefix = "${addr}/32"; }; + aliases = [ + "ponte.i" + ]; }; retiolum = { via = internet; -- cgit v1.2.3 From 9051f57095d4edfd22a68aa2798e38a44a2c94cb Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 9 Dec 2022 18:38:06 +0100 Subject: kartei tv: move krebs-pages mirror from xu to ni --- kartei/tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kartei') diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix index 428e1c3b..f7e86c59 100644 --- a/kartei/tv/default.nix +++ b/kartei/tv/default.nix @@ -198,6 +198,7 @@ in { aliases = [ "ni.r" "cgit.ni.r" + "krebs.ni.r" "search.ni.r" ]; tinc.pubkey = '' @@ -319,7 +320,6 @@ in { aliases = [ "xu.r" "cgit.xu.r" - "krebs.xu.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -369,7 +369,7 @@ in { "http://cgit.krebsco.de" = { desc = "Git repositories"; }; - "http://krebs.xu.r" = { + "http://krebs.ni.r" = { desc = "krebs-pages mirror"; }; }; -- cgit v1.2.3