diff options
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/kmein/default.nix | 2 | ||||
| -rw-r--r-- | kartei/krebs/default.nix | 12 | ||||
| -rw-r--r-- | kartei/tv/default.nix | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/kartei/kmein/default.nix b/kartei/kmein/default.nix index 39125e35..1a5a57d1 100644 --- a/kartei/kmein/default.nix +++ b/kartei/kmein/default.nix @@ -82,6 +82,8 @@ in "makanek.r" "makanek.kmein.r" "grafana.kmein.r" + "alertmanager.kmein.r" + "prometheus.kmein.r" "names.kmein.r" "graph.r" "rrm.r" diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix index 6da73ff8..e5626d92 100644 --- a/kartei/krebs/default.nix +++ b/kartei/krebs/default.nix @@ -165,12 +165,20 @@ 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 = { + ip4 = rec { addr = "141.147.36.79"; - prefix = "0.0.0.0/0"; + prefix = "${addr}/32"; }; + aliases = [ + "ponte.i" + ]; }; retiolum = { via = internet; 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"; }; }; |