summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-05-21 08:38:16 +0200
committermakefu <github@syntax-fehler.de>2020-05-21 08:38:16 +0200
commitd027d1d5316371280221870a9c05f2b35fb437ac (patch)
treee4c8e2a580d4d7d2d01f440ec837bed707db0c64 /krebs
parentab0906f7aab8a49186e64c4942a516686a132558 (diff)
parentcf5b35b2df428495f5bf4dd89e3cab190f069080 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/external/default.nix28
-rw-r--r--krebs/nixpkgs.json6
2 files changed, 31 insertions, 3 deletions
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index b437456ec..62cdf8542 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -68,6 +68,31 @@ in {
};
};
};
+ helsinki = {
+ owner = config.krebs.users.ajs124;
+ nets = {
+ retiolum = {
+ ip4.addr = "10.243.10.1";
+ aliases = [ "helsinki.r" ];
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIICCgKCAgEA5MnCmT9xVEtv3hoZsjmgF4pVnPgzaWWVrZVguMfXcbTiusgWqBIM
+ Ms/Ue676J3kQIJT1QSMA2RWDUU++dUcfhHF87vFpnyCnaKjfz6LyAwlSfKluttyY
+ aFNgcUWlZRl4wkqys/oYhLD1q26mO/ekCA2eohzbB1TCaPY97VM5nl0MkXStMN76
+ B+Ipw/gQcZXuWYct8Nj69sETPLnbf6ZBKs+T213as+NUSHVUdmBmV8QtmHDI3e7B
+ 4wAK1JkFCQgVu9gm/6BvqWroOMcmtxzSceyrY+0MWnAnM+wrLcYYaT2xw1OJyWmM
+ riOHHMw9iLVxqyQ+3eDucJRQcJzO7I4j8zQaoYxPE1ZSl4wTsaypkMuNOyhYv2C9
+ RNPJgTBlr911NnY7TcKauz/lO1Qcl5kHBMrIfwsbsQK+zfN2XX+s21/SPeSJ7k1N
+ OqXeyX0mz2l7bhBDwTTDtINSz8sB3BL59mVbWY5z5b90oeKPrfygmp7V0CSKgHBr
+ b5ZIhMRfgcK+HjolcEqdL9INpJZVFYt3vWPNhDpbX5sEOjjR+ODceriL8zdlTBRx
+ PyB9OiK6tN+L63QFM7H1NFN9fPeOd2WbHvfoeX255kx8FHSALKL5rVSz9Ejwc97k
+ rG0FItgHXajPazulBfUV0N9ck7SwLTmStKxtQ8NKCoIJLpv2ip4C+t0CAwEAAQ==
+ -----END RSA PUBLIC KEY-----
+ Ed25519PublicKey = 47fX1g6qynVprA+PtniBLEonFp1B70nMrJ8SBCWNJnL
+ '';
+ };
+ };
+ };
homeros = {
owner = config.krebs.users.kmein;
nets = {
@@ -399,6 +424,9 @@ in {
};
};
users = {
+ ajs124 = {
+ mail = "stockholm@ajs124.de";
+ };
ciko = {
mail = "wieczorek.stefan@googlemail.com";
};
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 9cef0dd78..d180b5f3b 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
- "rev": "1e90c46c2d98f9391df79954a74d14f263cad729",
- "date": "2020-04-20T23:47:17-04:00",
- "sha256": "1xs0lgh3q1hbrj0lbpy3czw41cv6vxx9kdf2npwc58z8xq3sdqmh",
+ "rev": "5adf2a6c11646898742b0c08f7e94101620ba707",
+ "date": "2020-05-11T09:54:07+01:00",
+ "sha256": "0wf7pwma2qyfak39b242mcq8z7cdj65sds7hcjxchy0448shapzi",
"fetchSubmodules": false
}