diff options
| author | tv <tv@krebsco.de> | 2022-08-23 11:25:31 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-08-23 11:25:31 +0200 |
| commit | afa416983a9fdf223a548b6c469c02dfae84023b (patch) | |
| tree | d65e39a4b8e8e94cc7594a4ec45bb0c205fb0dc3 | |
| parent | 86942a302126e66b7dcb03d66cb64facb7437ca1 (diff) | |
| parent | 9ae4a08ccc07964decc51fb1e92bc35d49e4691c (diff) | |
Merge remote-tracking branch 'prism/master'
| -rw-r--r-- | krebs/3modules/external/default.nix | 25 | ||||
| -rw-r--r-- | krebs/nixpkgs-unstable.json | 8 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 |
3 files changed, 33 insertions, 8 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 0cf004c9f..8ddd565d6 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -638,6 +638,31 @@ in { }; }; }; + iti = { + owner = config.krebs.users.feliks; + nets = { + retiolum = { + ip4.addr = "10.243.10.244"; + aliases = [ "iti.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA5TXEmw3F3lCekITBPW8QYF1ciKHN8RSi47k1vW+jXb6gdWcVo5KL + Ithq3T2+jWJJQoOJEDl5Tvo9ilF0oE0AqSNnvfgS/t8xfFVEsNvHodbonXXku5cF + N7oFooAgQRXAUJpEQLtcfx9kJutSYgGeEvoRGZkWaqY6tzPL45U2WEna+MJ/P1Cd + 57JMOLeJJEjZKtC/XqPOQ81KNcm161RKekHas5ZNK30QEVP9QsjTDoLesYwm1ywt + 4LiHRHSSHd65pKXJvi1haEYw25BxIun7kY4IQHrfEuK3DNs0kyYJj2rKL4C9kHgT + hYd+fFl1i/X1BjPzo+ZY91ahLVX3UPpOsB8vC9Q7Ctm1Nkc/bCfKRUNbamkS0Bwf + tngak3heGvuek6Y7qWQUkvMkPLhZwZUXUz+DBXGWXabP5LL8Z/y3V+Qqj0snEsZ3 + 9iOF+eeDw2/9hBzRzBPGtwL1DREgd+1J/XlHLcjF4jzkMhweIXw2Yh0Jq7D5Nqf3 + kPF9n/50zbQneSGEiKFeHm1ykag/KV0ebWHUOy1Gydbs7+RxT9GUiZofI6kyjJUI + g1w1ajkZYIIqhIvhMHudLay5h4kLkdGN9yuRNO/BG5sGk5MywZHyMploIX0ZRVui + +H3Sx2y268r/Fs6JcaddmzFwFqNmdRTRv/KBp91QGnjcaJDzQPKg/IsCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "uG9D7hrWNx+9otDFlZ8Yi31L6xxC7dzGlqXBLkzJCwE"; + }; + }; + }; hydrogen = { owner = config.krebs.users.sandro; nets = rec { diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 9c50f9709..97294d16d 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", - "date": "2022-07-18T18:21:45+02:00", - "path": "/nix/store/665hb1ysmaadwh4axp7f9inhczq08xay-nixpkgs", - "sha256": "0y0c9ybkcfmjgrl93wzzlk7ii95kh2fb4v5ac5w6rmcsq2ff3yaz", + "rev": "af9e00071d0971eb292fd5abef334e66eda3cb69", + "date": "2022-08-15T16:41:53+02:00", + "path": "/nix/store/6dvbaqmjjxx2rlh6986y2mj05083xy33-nixpkgs", + "sha256": "1mdwy0419m5i9ss6s5frbhgzgyccbwycxm5nal40c8486bai0hwy", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 799399ea7..3f3290eff 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "e732e1fdbf79bec59f7ade4a3675b091b4a9f6d6", - "date": "2022-07-19T15:32:15+02:00", - "path": "/nix/store/4dcxnk4xplx79xrwxg2m6pqh8b5k6ya0-nixpkgs", - "sha256": "1j73j17g852zfc75b7ll4avp30pnyvm37pgm66cz844phkv5ywfg", + "rev": "3d47bbaa26e7a771059d828eecf3bd8bf28a8b0f", + "date": "2022-08-15T18:36:06+02:00", + "path": "/nix/store/h05whycbmdvxzxp2zqzfm2rjbanr77q9-nixpkgs", + "sha256": "0xnk777bwrdw2zklnhs4sq6rgzb4gn002ybwlizj35g3vy5rppvs", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, |