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 | |
| parent | 519648574e85fe02550092eaa76298e62568b655 (diff) | |
| parent | b1068cadc4458d91889b7ede847829af33d2b145 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/external/kmein.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/external/mic92.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 8 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 |
4 files changed, 12 insertions, 9 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 diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 68484a102..d63277132 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -154,6 +154,8 @@ in { "krebsco.de" = '' latte.euer IN A ${nets.internet.ip4.addr} rss.euer IN A ${nets.internet.ip4.addr} + o.euer IN A ${nets.internet.ip4.addr} + bw.euer IN A ${nets.internet.ip4.addr} ''; }; cores = 4; @@ -217,7 +219,6 @@ in { mon.euer IN A ${nets.internet.ip4.addr} netdata.euer IN A ${nets.internet.ip4.addr} nixos.unstable IN CNAME krebscode.github.io. - o.euer IN A ${nets.internet.ip4.addr} photostore IN A ${nets.internet.ip4.addr} pigstarter IN CNAME makefu.github.io. share.euer IN A ${nets.internet.ip4.addr} @@ -233,14 +234,13 @@ in { maps.work.euer IN A ${nets.internet.ip4.addr} play.work.euer IN A ${nets.internet.ip4.addr} ul.work.euer IN A ${nets.internet.ip4.addr} - bw.euer IN A ${nets.internet.ip4.addr} ''; }; cores = 8; nets = rec { internet = { - ip4.addr = "144.76.26.247"; - ip6.addr = "2a01:4f8:191:12f6::2"; + ip4.addr = "142.132.189.140"; + ip6.addr = "fe80::9400:1ff:fe24:33f4"; aliases = [ "gum.i" ]; diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index c9b40c10f..e7760128f 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73", - "date": "2022-02-23T13:42:45-08:00", - "path": "/nix/store/g521qhbql6116naa3fjgga6dm0r24ynx-nixpkgs", - "sha256": "1p3pn7767ifbg08nmgjd93iqk0z87z4lv29ypalj9idwd3chsm69", + "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2", + "date": "2022-03-04T16:09:08+01:00", + "path": "/nix/store/xbb640k873m7nmchdrnijl0f9n540ys6-nixpkgs", + "sha256": "1rvp9gx7n0gppc86bcysaybw79zl3y8yninsgz6rawdjprzvg7y6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, |