From 2a1cc4949dea8f0eac6dc93e031b940c22d423f7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 18 Nov 2024 22:28:23 +0100 Subject: kartei l daedalus: rotate --- kartei/lass/daedalus.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'kartei') diff --git a/kartei/lass/daedalus.nix b/kartei/lass/daedalus.nix index 891cbd293..865f378b9 100644 --- a/kartei/lass/daedalus.nix +++ b/kartei/lass/daedalus.nix @@ -10,15 +10,20 @@ tinc = { pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAzlIJfYIoQGXishIQGFNOcaVoeelqy7a731FJ+VfrqeR8WURQ6D+8 - 5hz7go+l3Z7IhTc/HbpGFJ5QJJNFSuSpLfZVyi+cKAUVheTivIniHFIRw37JbJ4+ - qWTlVe3uvOiZ0cA9S6LrbzqAUTLbH0JlWj36mvGIPICDr9YSEkIUKbenxjJlIpX8 - ECEBm8RU1aq3PUo/cVjmpqircynVJBbRCXZiHoxyLXNmh23d0fCPCabEYWhJhgaR - arkYRls5A14HGMI52F3ehnhED3k0mU8/lb4OzYgk34FjuZGmyRWIfrEKnqL4Uu2w - 3pmEvswG1WYG/3+YE80C5OpCE4BUKAzYSwIDAQAB + MIICCgKCAgEA5SYx0hfmZ25mFzlnzdeoB46nMfJcyEuiJvMqNjRaeTRGe1UYFMOV + KdLYRqioMBbvIwU+7+1jslI3Tjfs9kWtt57p4ZqTUmfKZYkhA6onvKZUtQrv8M9c + sMOUhrY4p/QRvON4b9o9bZGdzDAX43EsAfDMW8YZvS6P+SQNeGORX3pimQ5ODY5N + P0rnFuYjGt3wAWcwyzmfKFedxcB/eDyYSjmhnkIwrODdS5rQyaCDKALSGBQ6bF4S + rvgy7PbwP71o8jVlhndOGyvZJPyx4yjwENrRWh6Wgwy/i2GYXWuc0+/Lvjq/X2k5 + C2LPGTfZ4rJaRdaS8EvOAy7uADemSymIGn3EM7qgLb2ogcQOFVtBHwWXYepLmbQi + lnGiE83eDcXKUs8lmnZQTP8C+Ho/SQCVXpgOg29BdwIZJ26Gv1ueVlhOKIvF7Pay + huRbQywgo7jnvNKk5TEGAX3bhUctT+UBJ+7JDHUJdqgJYKilYWwrK0jBVLSRqGTa + UHPCyM5zLdX6G8CXK7v+CbH66GsZxSkfxYjv049CWdbQ/BAW5hWUW77xTnP81/yi + 3a2XxtxxmCiGxl3+eqtXh5q2bOB/JKffGYfblHXJ3NK6HH5qVpcjT7CHKO21gqsb + hdPbKKD5aB2EJm+DYOnxS1UYsj7R/SmKGmNuQVfBm6jsBmjc4XmZQWECAwEAAQ== -----END RSA PUBLIC KEY----- ''; - pubkey_ed25519 = "ybmNcRLtZ0NxlxIRE3bdc2G4lLXtTGXu+iRaXMTKCNG"; + pubkey_ed25519 = "+xM97iA8eIB58bfsEjMfK7aqv+Emzajx5CYqSGjRR/K"; }; }; wiregrill = { @@ -26,8 +31,8 @@ aliases = [ "daedalus.w" ]; - wireguard.pubkey = "ZVTTWbJfe8Oq6E6QW1qgXU91FnkuKDGJO3MF3I3gDFI="; + wireguard.pubkey = "1/ZN/YvIBpWJGIwf0EE5NpxnQVCsde8f5WR3LExRW0M="; }; }; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5Ovdcsljr5dOl7+2sQNKpGpdX0SlOIuCZKEiWEp8g"; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjmN3oUAj/3AFH0t4JdCjWn+AzyYyr8Dhp0oqq9Nzbu"; } -- cgit v1.2.3 From df90bff9def5e9d94a8289ac739d952acc217e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jan 2025 13:51:38 +0100 Subject: kartei mic92: drop rock --- kartei/mic92/default.nix | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 2a4593e72..28292c1a8 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -54,7 +54,7 @@ in { }; rauter = { owner = config.krebs.users.mic92; - nets = rec { + nets = { internet.addrs = [ "rauter.thalheim.io" ]; retiolum = { aliases = [ "rauter.r" ]; @@ -305,33 +305,6 @@ in { }; }; }; - rock = { - owner = config.krebs.users.mic92; - nets = { - internet.addrs = [ "rock.thalheim.io" ]; - retiolum = { - aliases = [ - "rock.r" - ]; - tinc.pubkey = '' - -----BEGIN PUBLIC KEY----- - MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0uhNk3XXVxQcIVhD1Ime - 9PY3QBIcXvwDlOrd3oUwyWTvZpUeO7yzIXdouAe4s0ohPIVq7Cmruj4ZrOGUCKyB - oJpOziYSbL/IiCpXyOzWMLEwu0AoeFfbxig+5oZfwQ9epM2j902CgsUipJBLIg48 - BC9oOD+/iYEwsFPqQ/S0kETyQK5Ad+qv0lbU6/Kmify8Qplvpv/8DRdjsdLki1fU - a6MAEw12OtHe6IWtlitPjFMBykTP6kkSp/eg0G2KZFVuEulwHGf9QT/eT4fZTMCC - 2V5Vp4rIr/hawmj+h4NIxniBSQcPAAIGNwZVC4uYYV1nd4iaI/T04rDJwte5WKHf - EVxtlYt9RU1I/XdNRSj9gYyneVcVlDVos8Z93oUv1hIGZYFtNmGVna6lggOBPf/t - BZ1MT6FKA4QX9JI8bQoNs18s8ffzyb07psNbH6YhpCygnhf9C7NR/CeI8BtpzJza - 1Qk731Z6bk6xRFKMuY2tRKlNCqPHULj44oTHB3Ki2B/bMlkguqSChfFzKIRASYO1 - SASSgddexjkjKLslxcLWhIqYrZhuhYlFyoeoMI3qQsey/4X5PUmQDxxhTT80+qvE - thBNPg46joyLTq9E9ddf7t/0C6oD2DXY88N9bkztuK5dtYHmjajUbePuaTJtrKhI - 7MnLboZCEiSyvkVTTx0Yjf0CAwEAAQ== - -----END PUBLIC KEY----- - ''; - }; - }; - }; turingmachine = { owner = config.krebs.users.mic92; nets = rec { -- cgit v1.2.3 From 238d2a5693903647d59aa03804621ed2867a3bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jan 2025 13:53:22 +0100 Subject: kartei mic92: drop maurice --- kartei/mic92/default.nix | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 28292c1a8..4676ebf4a 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -486,47 +486,6 @@ in { }; }; - maurice = { - owner = config.krebs.users.mic92; - nets = rec { - retiolum = { - ip4.addr = "10.243.29.200"; - aliases = [ "maurice.r" ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAsLKBfPtZkjWGu6uitCV+4c5aQox2t4N8XNhY2mqE806XsYrqAC+y - d0oLOxRMUjfh9stDnEW/YRoLEKz9oZdRYd4eenP0Q3c3HdRFDBNCs27M5a8ysqZD - 5w9+B+9OfUmMv61NyKiaR6WtoGbE849cj1UNk1z04elshfU7h829D8QnD4j1A1gf - bOaNG+RzOP6qP/6Q30rxAiTxRPi+FhcHvxa33y1ZVobvnfGcJa+AzsTbgH9T9Yob - GuXFZvuQVSyWOLOgY/vVml904q8gScMpBesAsZJ7DEXxSTga0Rt99Ti3d9ABwBI5 - 1YabQlGLaAkrj3PMgrDyayzGBDDDva9fEQIDAQAB - -----END RSA PUBLIC KEY----- - ''; - tinc.pubkey_ed25519 = "pkMuJ4kbyleQAdau+sfmLtzTuUy7uL+wwcgV/GWC7/N"; - }; - }; - }; - - mauricehome = { - owner = config.krebs.users.mic92; - nets = rec { - retiolum = { - aliases = [ "mauricehome.r" ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwFmnVmH2n3sa/iJE1u7kSWHMW2nx66wnq7ZA2XF5Wt1hiky4BKBj - jxIIdXHlSmARhDSCMgBKl9Z6/8PsmCK3xEO8q60oTsT8PQIhN3eSF8n92iK3dyKx - PyUsUUHjkqkNtmo/M70T4gAEuB1b/QRkATco/pTv+lMVkYdIydtdALjSxU0YrTiz - J5Ntsngi9+yUJ5g3r/lCuWobKxd5Dlsx3nXg81jTsp9hlXW2HC0XTbOSyH2NC36C - 97Kgx2T25cG/FPhtQztQOems+FhbyJTFyZTGa8v/5rXeJlwcVFRh8sZ7E5yPzbJV - ZlBaorcpRtx8NY4jd8FnZftHF0BeAQJoYwIDAQAB - -----END RSA PUBLIC KEY----- - ''; - tinc.pubkey_ed25519 = "ohFUBMdmgS/DMe24sZ1+jNWzx65jCxto9pVjPnYIqzL"; - }; - }; - }; - mickey = { owner = config.krebs.users.mic92; nets = rec { @@ -1063,6 +1022,8 @@ in { }; }; + ace = { + }; }; users = { mic92 = { -- cgit v1.2.3 From 3f4fe2e313469fc657beebd4f0b816c139dcfbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jan 2025 14:38:22 +0100 Subject: kartei mic92: add new hosts --- kartei/mic92/default.nix | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index 4676ebf4a..a21265b78 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -1023,6 +1023,58 @@ in { }; ace = { + owner = config.krebs.users.mic92; + nets = rec { + internet = { + # irene.dos.cit.tum.de + ip4.addr = "131.159.38.181"; + ip6.addr = "2a09:80c0:38::181"; + aliases = [ "ace.i" ]; + }; + retiolum = { + via = internet; + aliases = [ "ace.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAtUCw2AeXPFdD1Wisx4+SlEIUulSl2LMELcgbwDia4WSikC9rljLy + RZwUss9Ue0bZgt1IcTj5p5LjWXU+jEauhZnJSXdYvgzWQd+oPOH6zM4K4MEt1SIa + iC3UkY900gTiUx6VUHlCTMH6+2dPOhMsOVVXwaywkpL2YwXVGar+NMolOkoBy+ZA + DmKrcWfapnuvkXeCDNIXkmACapjyJAgC+0OII9tOTtVa0t4eI6bqBBe2NvVUXUCh + UUkvezLxHE3OnV8HW8L4vxURlgIWH5kd7gGy8WFTSqusqtv7MAjXX48BJxSgJKfq + wqTwgA4V6SCuFoui4W51KAFxP7eS755B2wIDAQAB + -----END RSA PUBLIC KEY----- + ''; + + tinc.pubkey_ed25519 = "aiUOGsOxowPNBG10vMOVJN1u2Xm2tL8M91oeO8u2AXC"; + }; + }; + }; + + ian = { + owner = config.krebs.users.mic92; + nets = rec { + internet = { + # ian.dos.cit.tum.de + ip4.addr = "131.159.102.30"; + ip6.addr = "2a09:80c0:102::30"; + aliases = [ "ian.i" ]; + }; + retiolum = { + via = internet; + aliases = [ "ian.r" ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAyfm4Bqg7SOHjXl6PRUVwdDAsYigj7aOYhL7lPKoEADUYIXO0/d+Y + t6KzKGV0Lvz0cKMiY4sGVJ8KGvEb1VhfKLSUdqCPY5spT44zbpvyrOSck6aGOB50 + Fu1EEtGj9uPtJorJx0UtjMi4WPEUs5Xg1YxxncmFB8pFfQcqIVUh7l5lPiCB2Udq + P+GPwnewTDTJvqCN7Rc6zW8WKjxJseNXkFF/hdZuNPSKE+fvQdkrfDmYt8KbWVV+ + 0LlsCxT4rLkIhvqEXMA6wELtnGAw8PflBV3tFmBBRTG64Bj7Sni7QI359QL+5sBo + rXgOTExX37JnSPIXtAmKm6r3+eexZwOB4wIDAQAB + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "pjccEHqFQ0eq+TvTFm9mjTkisS7aOMVimi5wMGsgwnB"; + }; + }; }; }; users = { -- cgit v1.2.3 From 8a8eb5bd849d24eb82b97eda18f9065bd6cc79c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jan 2025 14:51:02 +0100 Subject: kartei/mic92: drop stable-confusion.r --- kartei/mic92/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'kartei') diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix index a21265b78..7a65587aa 100644 --- a/kartei/mic92/default.nix +++ b/kartei/mic92/default.nix @@ -713,7 +713,6 @@ in { via = internet; aliases = [ "jack.r" - "stable-confusion.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3