diff options
author | tv <tv@krebsco.de> | 2022-03-18 16:52:49 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2022-03-18 16:52:49 +0100 |
commit | 60bdd171f50cd9350f69d7df46049c48070e638d (patch) | |
tree | bbedbf1c59f61c0de71cea14bb9c6c76ab73b653 /krebs/3modules/external | |
parent | 519648574e85fe02550092eaa76298e62568b655 (diff) | |
parent | b1068cadc4458d91889b7ede847829af33d2b145 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/external')
-rw-r--r-- | krebs/3modules/external/kmein.nix | 1 | ||||
-rw-r--r-- | krebs/3modules/external/mic92.nix | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/krebs/3modules/external/kmein.nix b/krebs/3modules/external/kmein.nix index 4605fbdf0..6e4457eae 100644 --- a/krebs/3modules/external/kmein.nix +++ b/krebs/3modules/external/kmein.nix @@ -125,6 +125,7 @@ in "grocy.kmein.r" "moodle.kmein.r" "radio.kmein.r" + "home.kmein.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index db57b5944..b62ece0c7 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -146,7 +146,6 @@ in { owner = config.krebs.users.mic92; nets = rec { retiolum = { - ip4.addr = "10.243.29.177"; aliases = [ "herbert.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -163,6 +162,9 @@ in { }; eve = { owner = config.krebs.users.mic92; + extraZones."krebsco.de" = '' + mukke IN CNAME eve.thalheim.io. + ''; nets = rec { internet = { # eve.thalheim.io |