From d3d9f58badbcad548bb7c7ca98757cfbd4143f96 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 3 Aug 2019 13:19:59 +0200 Subject: nixpkgs: 754763f -> 4f2b76e --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 7363507a..72afac98 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "754763ff4ba1dd03fe3fad3a0fea36d2e39f5860", - "date": "2019-07-05T14:34:03+02:00", - "sha256": "10752kda1rzljlpcchi826hmbc8853vnbg9rkh7s89mxq6yjnm15", + "rev": "4f2b76e45fcaf962137ae6a36a9cc60873be6ec2", + "date": "2019-08-02T21:36:54-04:00", + "sha256": "1c3h6a39cim2fdnwq6cp75dm46xfqc2mnsj0zgnrp412dqmaxkkc", "fetchSubmodules": false } -- cgit v1.2.3 From 0726c033b40c8f6aae715f3dbf5313304bbb4d44 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Aug 2019 17:34:24 +0200 Subject: hotdog.r: disable repo-sync --- krebs/1systems/hotdog/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'krebs') diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 32e41683..60ec625f 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -14,7 +14,6 @@ - ]; krebs.build.host = config.krebs.hosts.hotdog; -- cgit v1.2.3 From e754ced01e2d5ef84dabba391bba2f372694b7cb Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Aug 2019 17:34:51 +0200 Subject: l phone.r: rotate secrets --- krebs/3modules/lass/default.nix | 4 ++-- krebs/3modules/lass/ssh/android.rsa | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 217edfdd..a8314e11 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -595,12 +595,12 @@ in { aliases = [ "phone.w" ]; - wireguard.pubkey = "MRicxap2VxPnzmXoOqqjQNGWJ54cQC8Tfy28+IXXsxM="; + wireguard.pubkey = "FY4PB8E/RC2JvtLgq/IDyMmZ9Ln6pz6eGyoytmUFMgk="; }; }; external = true; ci = false; - syncthing.id = "DUFMX7V-HNR6WXM-LZB5LJE-TM6QIOH-MTGHEUJ-QSD3XIY-YRFJLOR-G6Y3XQB"; + syncthing.id = "PWKVXPB-JCNO6E4-KVIQ7CK-6FSOWHM-AWORMDU-HVVYLKW-44DQTYW-XZT7DQJ"; }; morpheus = { cores = 1; diff --git a/krebs/3modules/lass/ssh/android.rsa b/krebs/3modules/lass/ssh/android.rsa index 675ba8df..21b8e015 100644 --- a/krebs/3modules/lass/ssh/android.rsa +++ b/krebs/3modules/lass/ssh/android.rsa @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPF7RHU4q6w1f3xWcfeAD6u23jDs2fd/H3IuxdT5G1ZL +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpP5YExkzwfmn7GpvnmZZRx1S+jmZyYrOf7b5cZZnbF -- cgit v1.2.3 From d93ed46e08d834029557379b182c9649cac175c0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Aug 2019 11:08:50 +0200 Subject: nixpkgs: 4f2b76e -> e021485 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 72afac98..fd73bd14 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "4f2b76e45fcaf962137ae6a36a9cc60873be6ec2", - "date": "2019-08-02T21:36:54-04:00", - "sha256": "1c3h6a39cim2fdnwq6cp75dm46xfqc2mnsj0zgnrp412dqmaxkkc", + "rev": "e02148563af765625be323465fb7a1d22072d88c", + "date": "2019-08-26T07:58:15-04:00", + "sha256": "1fa84bf9gpd5n1lc0ifxda44hbdkg8ka720yxsg6h8plsqjjxzs8", "fetchSubmodules": false } -- cgit v1.2.3 From 8d4adbf38ce7bffc8b1532c26c0b33dcb480c87d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 4 Sep 2019 00:13:26 +0200 Subject: external: add crustacea.r (0x4A6F) --- krebs/1systems/wolf/config.nix | 2 +- krebs/3modules/external/default.nix | 32 ++++++++++++++++++++++++++++++-- krebs/3modules/external/ssh/0x4A6F.pub | 1 + krebs/3modules/external/ssh/0x4a6f.pub | 1 - 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 krebs/3modules/external/ssh/0x4A6F.pub delete mode 100644 krebs/3modules/external/ssh/0x4a6f.pub (limited to 'krebs') diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix index 3cb358ca..9ae65466 100644 --- a/krebs/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -139,7 +139,7 @@ in ''; users.extraUsers.root.openssh.authorizedKeys.keys = [ - config.krebs.users."0x4a6f".pubkey + config.krebs.users."0x4A6F".pubkey config.krebs.users.ulrich.pubkey config.krebs.users.raute.pubkey config.krebs.users.makefu-omo.pubkey diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 66f9620c..640adfc0 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -588,6 +588,34 @@ in { }; }; }; + crustacea = { + owner = config.krebs.users."0x4A6F"; + nets = { + retiolum = { + ip4.addr = "10.243.42.63"; + ip6.addr = "42:4a6f::4263"; + aliases = [ + "crustacea.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuuQlpyE4+8NSwMLs4A7c + /sTNlZ6sIdlEQmyNwLZBPEW3GhwLKXdnKzF7lb2vaUXtTDfw+Ijo4c7zlXh0QKGq + VbAoEV7Sau0OEjbrPHzaZvhZoKEIYR0Tz/OBm0cOM0vwyPcbXo//uDVGi7ZkAKZU + 0OLkcagJcpJ6gep7OKSC6FRDtvUGKRQFfSOy3MhB05P7WwTREbf2J/YZwBFoSWGK + /ldrqdN9+olQ6TvMaOw4U5c6D0zCALPL9iOK6ADBub22E4SQOIzeUIg0KePoit/F + sNl10NCLMRjvM9JMzr61krJfeVZ1oRo63zU3dKQYuQ/7x+MYl/yIyZ9d7bkX21zZ + +2SloxbgGmeChd/20u0scsMUljtDdyQS9vU0xeyur8jpmrg26RSeWzvieJKXLJBD + EdRJ5kXQHhl1EGKdl5zG6bXBMb9ruU1xoUMy14+wDLSoUkCWdQFFv+nVrEtkoOaX + 7QWggGc12EEtFhvzM5E8iqcLAWe3j8za114IXTwGJETWWmKoh4QLBA77OZpGD3MK + JGkK4HcH0ZBmO4Cx5G27C/6+vqNMVWd8WUn3OD9qYLF+gsFMTAdRUabIrac8D8ft + qKxiBCNDJXOUiXP3Ge7tu4XJxvOPsWkUdmnKosIX2grsmbrVvtDcfVM8lXrqRzP/ + +TlkcsPVjEDtz/7i9NsXij8CAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; unnamed = { owner = config.krebs.users.pie_; nets = { @@ -678,9 +706,9 @@ in { mail = "shackspace.de@myvdr.de"; pubkey = ssh-for "ulrich"; }; - "0x4a6f" = { + "0x4A6F" = { mail = "0x4a6f@shackspace.de"; - pubkey = ssh-for "0x4a6f"; + pubkey = ssh-for "0x4A6F"; }; miaoski = { }; diff --git a/krebs/3modules/external/ssh/0x4A6F.pub b/krebs/3modules/external/ssh/0x4A6F.pub new file mode 100644 index 00000000..1ea084ba --- /dev/null +++ b/krebs/3modules/external/ssh/0x4A6F.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMoQSUz0wcV8tnTKsYO3sO6XG6EHap8R63ihfMHkxPS diff --git a/krebs/3modules/external/ssh/0x4a6f.pub b/krebs/3modules/external/ssh/0x4a6f.pub deleted file mode 100644 index 1ea084ba..00000000 --- a/krebs/3modules/external/ssh/0x4a6f.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMoQSUz0wcV8tnTKsYO3sO6XG6EHap8R63ihfMHkxPS -- cgit v1.2.3 From 5d24345ff430df38263c113041070a900c23131e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 4 Sep 2019 13:35:33 +0200 Subject: external crustacea.r: use another key + ed25519 --- krebs/3modules/external/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 640adfc0..aac67f2e 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -599,19 +599,19 @@ in { ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuuQlpyE4+8NSwMLs4A7c - /sTNlZ6sIdlEQmyNwLZBPEW3GhwLKXdnKzF7lb2vaUXtTDfw+Ijo4c7zlXh0QKGq - VbAoEV7Sau0OEjbrPHzaZvhZoKEIYR0Tz/OBm0cOM0vwyPcbXo//uDVGi7ZkAKZU - 0OLkcagJcpJ6gep7OKSC6FRDtvUGKRQFfSOy3MhB05P7WwTREbf2J/YZwBFoSWGK - /ldrqdN9+olQ6TvMaOw4U5c6D0zCALPL9iOK6ADBub22E4SQOIzeUIg0KePoit/F - sNl10NCLMRjvM9JMzr61krJfeVZ1oRo63zU3dKQYuQ/7x+MYl/yIyZ9d7bkX21zZ - +2SloxbgGmeChd/20u0scsMUljtDdyQS9vU0xeyur8jpmrg26RSeWzvieJKXLJBD - EdRJ5kXQHhl1EGKdl5zG6bXBMb9ruU1xoUMy14+wDLSoUkCWdQFFv+nVrEtkoOaX - 7QWggGc12EEtFhvzM5E8iqcLAWe3j8za114IXTwGJETWWmKoh4QLBA77OZpGD3MK - JGkK4HcH0ZBmO4Cx5G27C/6+vqNMVWd8WUn3OD9qYLF+gsFMTAdRUabIrac8D8ft - qKxiBCNDJXOUiXP3Ge7tu4XJxvOPsWkUdmnKosIX2grsmbrVvtDcfVM8lXrqRzP/ - +TlkcsPVjEDtz/7i9NsXij8CAwEAAQ== + MIICCgKCAgEA1dA67Uq6IcWTWVVcg5kO4OUcmYY/mUzERK6WwrU7m+Qq2ovA2Fh1 + VTxfNzJg8zgyrBbUwpaLE4LuRgyrYbPABwgNMXS6wnHdunbm0x5RUcih/IRNobV1 + uf2Q/rVcrXHZD5+YL09hTZnU7PVkZm6WX0fc79rEKYIEopPpomCs2mECPSmqZPaW + L9wprtRTuQ3V0xxrCuUKX7SxANEursM8SvNfKydWdaUxjIV2iGVKuVUkAZHwx5jJ + roKEriWsIJ6FHTMb1v5yWXrvngMgYlKrpF6/m/AHEkQoPsEJ+oBkn0fop9pfyZjM + WzMhZHcKFYebSI4HqFRuQOc1scIzUdpC/sZYLYlddbwpJHj4xdJwIUN03Uga/KRQ + n1SrJnhmXonHvJZFBYcNDR6aTtdN7mJVBv8bQ7DGt1q6Gp8QItQqvpdzq314+Pw6 + 0EVKPaqdz6Cqpwn8RtJ9ZGb6BE3yUrpJkU25DyCSO86LmeCchApwssghWvPsbBDg + iF4QCyrWJ2HFnl7jJDGbEajHaE/xko2dt1F5frTWxsmDHRKSRhaGDwp5qgFUpCa0 + 2h+zZqkG4boV6CrMEjStb15EOXTUVfq0DPojFik6agCltslsJAwp+f1fb7NSee4d + TNWb1CHfIQWLPnm1LFwphSqyHY/9ehcsX3PJ7oXI+/BnV8ivvoApWA0CAwEAAQ== -----END RSA PUBLIC KEY----- + Ed25519PublicKey = DWfh6H8Qco+GURdVRhKhLBAsN5epsEYhOM2+88dTdTE ''; }; }; -- cgit v1.2.3 From 5304a296d58b05aa2bdd2dc293ad6a8a4698f96b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 4 Sep 2019 14:00:46 +0200 Subject: nixpkgs: e021485 -> 541d9cc --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index fd73bd14..64aa3390 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "e02148563af765625be323465fb7a1d22072d88c", - "date": "2019-08-26T07:58:15-04:00", - "sha256": "1fa84bf9gpd5n1lc0ifxda44hbdkg8ka720yxsg6h8plsqjjxzs8", + "rev": "541d9cce8af7a490fb9085305939569567cb58e6", + "date": "2019-09-02T14:22:35+02:00", + "sha256": "0jgz72hhzkd5vyq5v69vpljjlnf0lqaz7fh327bvb3cvmwbfxrja", "fetchSubmodules": false } -- cgit v1.2.3 From fbca35a6b4b4bba3ee012ce5bd38d63d02246bde Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 7 Sep 2019 22:45:07 +0200 Subject: external: add qubasa ssh pubkey --- krebs/3modules/external/default.nix | 1 + krebs/3modules/external/ssh/qubasa.pub | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 krebs/3modules/external/ssh/qubasa.pub (limited to 'krebs') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index aac67f2e..0f28bd92 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -695,6 +695,7 @@ in { }; qubasa = { mail = "luis.nixos@gmail.com"; + pubkey = ssh-for "qubasa"; }; raute = { mail = "macxylo@gmail.com"; diff --git a/krebs/3modules/external/ssh/qubasa.pub b/krebs/3modules/external/ssh/qubasa.pub new file mode 100644 index 00000000..e9e1e6a2 --- /dev/null +++ b/krebs/3modules/external/ssh/qubasa.pub @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB0d0JA20Vqn7I4lCte6Ne2EOmLZyMJyS9yIKJYXNLjbLwkQ4AYoQKantPBkTxR75M09E7d3j5heuWnCjWH45TrfQfe1EOSSC3ppCI6C6aIVlaNs+KhAYZS0m2Y8WkKn+TT5JLEa8yybYVN/RlZPOilpj/1QgjU6CQK+eJ1k/kK+QFXcwN82GDVh5kbTVcKUNp2tiyxFA+z9LY0xFDg/JHif2ROpjJVLQBJ+YPuOXZN5LDnVcuyLWKThjxy5srQ8iDjoxBg7dwLHjby5Mv41K4W61Gq6xM53gDEgfXk4cQhJnmx7jA/pUnsn2ZQDeww3hcc7vRf8soogXXz2KC9maiq0M/svaATsa9Ul4hrKnqPZP9Q8ScSEAUX+VI+x54iWrnW0p/yqBiRAzwsczdPzaQroUFTBxrq8R/n5TFdSHRMX7fYNOeVMjhfNca/gtfw9dYBVquCvuqUuFiRc0I7yK44rrMjjVQRcAbw6F8O7+04qWCmaJ8MPlmApwu2c05VMv9hiJo5p6PnzterRSLCqF6rIdhSnuOwrUIt1s/V+EEZXHCwSaNLaQJnYL0H9YjaIuGz4c8kVzxw4c0B6nl+hqW5y5/B2cuHiumnlRIDKOIzlv8ufhh21iN7QpIsPizahPezGoT1XqvzeXfH4qryo8O4yTN/PWoA+f7o9POU7L6hQ== lhebendanz@nixos + -- cgit v1.2.3 From 95d219e4863f38cb5d0d36f63de2e9a3fb13eddd Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 11 Sep 2019 11:53:11 +0200 Subject: external: add jongepad.r --- krebs/3modules/external/default.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 0f28bd92..f12dda09 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -229,6 +229,32 @@ in { }; }; }; + jongepad = { + owner = config.krebs.users.jonge; + nets = { + retiolum = { + ip4.addr = "10.243.5.6"; + aliases = [ + "jongepad.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAtJsF5jL/M72PCptLFC5iIEt0qAL544H/VLijvZEG9gnoqbs94aNJ + MM5Sr3yMB01WkcT1Lph3r4dxV0/QECu3Ca4xxuUntu42tFXhkikQGcZLuo2h4zr4 + +wReudCCc7VqMcJDxriyyoW3i7smZnQGzo36gpKHbZfil8dJo0QE8mnujqkQCA0G + hjR7xdG+/usDgRUarfpNgoHKyZfLcomQLUuR8I3aHsdaCLgMJ8v5DjGymp2bIswT + puPx3IEZSXH8y6MZoISvLn+hwcWat34Bj1PF7vfgldivqHaDFpifpXvjbCmxcel9 + WVZRSEvLSVT4FnpaJ7JkAaUpG+GOHVlPWARq9t9AZXKR1Zex9MIkHzWi/TIIkawj + wJNvUwvBYJ1UCuCby4/3nKlY7zWjj23YM6dTJDGMhJKR5m2SHp9SC0m0QdfSjN5z + 8sJauCigGZ6rlmxkO4/2BBGshY8jWDl/z2oFiQfo7R2oZkJdWNHLGKtTZtqQQ3e6 + SAE/HQvipiv35rMzHw3E9AJBhhQqT3vTLLZvMTBS6BRFvpqDNhXik1aFenNV4tjZ + XeYU1eXI4XzQqoW/avPTuLt8O0Ya/nziLXCaIy+hlx5Hd49hkGb+1saQ5yPUgoEt + wE9sy5+9b5ebn8B+N0yw7wnUYN8V8dmPmRwLt71IuBwHn/aAoXyWwFsCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; rose = { owner = config.krebs.users.Mic92; nets = rec { @@ -685,6 +711,9 @@ in { jan = { mail = "jan.heidbrink@posteo.de"; }; + jonge = { + mail = "jacek.galowicz@gmail.com"; + }; kmein = { mail = "kieran.meinhardt@gmail.com"; pubkey = ssh-for "kmein"; -- cgit v1.2.3 From 20e38840fed74e5a71342c1ba335a6bf0ad5080a Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 11 Sep 2019 11:53:28 +0200 Subject: nixpkgs: 541d9cc -> 8a30e24 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 64aa3390..a72f5cad 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "541d9cce8af7a490fb9085305939569567cb58e6", - "date": "2019-09-02T14:22:35+02:00", - "sha256": "0jgz72hhzkd5vyq5v69vpljjlnf0lqaz7fh327bvb3cvmwbfxrja", + "rev": "8a30e242181410931bcd0384f7147b6f1ce286a2", + "date": "2019-09-10T08:24:01-04:00", + "sha256": "0574zwcgy3pqjcxli4948sd3sy6h0qw6fvsm4r530gqj41gpwf6b", "fetchSubmodules": false } -- cgit v1.2.3