From 36603ca13794ecb9ce05b78c2df69831f7bd36a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 25 Jun 2021 09:37:20 +0200 Subject: mic92: add matchbox ed25519 key --- krebs/3modules/external/mic92.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index bbefb8ed8..4bde2ac2b 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -389,6 +389,7 @@ in { nCShp7V+MSmz4DnLK1HLksLVLmGyZmouGsLjYUnEa414EI6NJF3bfEO2ZRGaswyR /vW066YCTe7wi+YrvrMDgkdbyfn/ecMTn2iXsTb4k9/fuO0+hsqL+isCAwEAAQ== -----END RSA PUBLIC KEY----- + Ed25519PublicKey = 1wPa2cmQ4FUFw9289d0KdG1DcDuMNIYMWzIUnVVHu2P ''; }; }; -- cgit v1.2.3 From 5f38a5d722caa7f9f42332e5d6ff4af6c997aaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Jul 2021 13:50:29 +0200 Subject: mic92: add redha ed25519 keys --- krebs/3modules/external/mic92.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index 4bde2ac2b..2fcf9180d 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -619,6 +619,7 @@ in { FK5qRrQFMRFB8KGV+n3+cx3XCM2q0ZPTNf06N+Usx6vTKLASa/4GaTcbBx+9Dndm mFVWq9JjLa8e65tojzj8PhmgxqaNCf8aKwIDAQAB -----END RSA PUBLIC KEY----- + Ed25519PublicKey = oRGc9V9G9GFsY1bZIaJamoDEAZU2kphlpxXOMBxI2GN ''; }; }; -- cgit v1.2.3 From 1d29774766b46fb37350c44da5d98c49c39b66b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Jul 2021 14:26:06 +0200 Subject: mic92: update bills ip address --- krebs/3modules/external/mic92.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index 2fcf9180d..d5eb47630 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -427,8 +427,8 @@ in { owner = config.krebs.users.mic92; nets = rec { internet = { - ip4.addr = "131.159.38.191"; - ip6.addr = "2a09:80c0:38::191"; + ip4.addr = "131.159.102.1"; + ip6.addr = "2a09:80c0:102::1"; aliases = [ "bill.i" ]; }; retiolum = { -- cgit v1.2.3 From d1059dccf55b7aaf5c7d7cf15d71c513080c5711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 12 Jul 2021 14:34:02 +0200 Subject: mic92: connect to tinc via internet for bill/nardole --- krebs/3modules/external/mic92.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index d5eb47630..ea8623702 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -432,6 +432,7 @@ in { aliases = [ "bill.i" ]; }; retiolum = { + via = internet; addrs = [ config.krebs.hosts.bill.nets.retiolum.ip4.addr config.krebs.hosts.bill.nets.retiolum.ip6.addr @@ -466,6 +467,7 @@ in { aliases = [ "nardole.i" ]; }; retiolum = { + via = internet; addrs = [ config.krebs.hosts.nardole.nets.retiolum.ip4.addr config.krebs.hosts.nardole.nets.retiolum.ip6.addr -- cgit v1.2.3 From 6763b4475fb6c1f49f2cc49218d8a3b03afc19b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 Jul 2021 16:09:48 +0200 Subject: mic92: add ed25519 for grandalf --- krebs/3modules/external/mic92.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index ea8623702..7bd5a2290 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -644,6 +644,7 @@ in { jb+EGlT/vq3+oGNFJ7Shy/VsR5GLDoZ5KCsT45DM87lOjGB7m+bOdizZQtWmJtC/ /btEPWJPAD9lIY2iGtPrmeMWDNTW9c0iCwIDAQAB -----END RSA PUBLIC KEY----- + Ed25519PublicKey = dzjT09UeUGJCbUFrBo+FtbnXrsxFQnmqmJw7tjpJQJL ''; }; }; -- cgit v1.2.3 From 483c3d608d61a8bf0c3463071675075f051830b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 21 Jul 2021 08:03:35 +0200 Subject: mic92: add paulheidekrueger --- krebs/3modules/external/mic92.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index 7bd5a2290..e3d0a9a79 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -334,6 +334,25 @@ in { ''; }; }; + paulheidekrueger = { + owner = config.krebs.users.mic92; + nets.retiolum = { + ip4.addr = "10.243.29.197"; + aliases = [ + "paulheidekrueger.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA45fCjKIgzLBbiHxHNH8ar4ERlF+oS4rKtsei7+fqUVj2zVbFB5Dd + OPm3kn3ZYi2WlhQBSPCphThEAGP6MrLuY2liiPyECfYNrr0+iDXaBl3Eq+fEu0Rm + 6rXa+paL49L86Lbe+ituS+9Q77rHcxixEir/2NBv4qENlgHJos9gZFn3kS8fLzly + kVkK8VRKvWgkW7sAfEKa2uQSXh+Ea08JCrTeGC0H19rYVIFZIIRSR7uXZygDHvOO + 5Gbnqp9Ya2yP6I00VTDVmJRJuzQjUciufa5XC5b7J1JP7Wo23sa0wV5eYZ0ZPFF4 + qJXjhuLtfSvaPrQTsIwrt7Z1s3tlXDlh8QIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; martha = { owner = config.krebs.users.mic92; nets = rec { -- cgit v1.2.3 From 98437c4641ec1c18f7e98f431f781065291b6875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 29 Jul 2021 14:37:31 +0200 Subject: mic92: remove paulheidekrueger; add yasmin --- krebs/3modules/external/mic92.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'krebs/3modules/external/mic92.nix') diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index e3d0a9a79..3ef693290 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -334,22 +334,23 @@ in { ''; }; }; - paulheidekrueger = { + yasmin = { owner = config.krebs.users.mic92; nets.retiolum = { ip4.addr = "10.243.29.197"; aliases = [ - "paulheidekrueger.r" + "yasmin.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA45fCjKIgzLBbiHxHNH8ar4ERlF+oS4rKtsei7+fqUVj2zVbFB5Dd - OPm3kn3ZYi2WlhQBSPCphThEAGP6MrLuY2liiPyECfYNrr0+iDXaBl3Eq+fEu0Rm - 6rXa+paL49L86Lbe+ituS+9Q77rHcxixEir/2NBv4qENlgHJos9gZFn3kS8fLzly - kVkK8VRKvWgkW7sAfEKa2uQSXh+Ea08JCrTeGC0H19rYVIFZIIRSR7uXZygDHvOO - 5Gbnqp9Ya2yP6I00VTDVmJRJuzQjUciufa5XC5b7J1JP7Wo23sa0wV5eYZ0ZPFF4 - qJXjhuLtfSvaPrQTsIwrt7Z1s3tlXDlh8QIDAQAB + MIIBCgKCAQEAnQ6HGgUPVQbDIsLZAawZu4vK9yHF02aDrIWU9SdzpAddhM8yqWeC + f55W6zyjZuoQ2w4UNthDl6gjQM6A9B+nEMRNz3Rnhp57Lyi0a6HZHF2Eok9vJBiu + IRbVUxPpPKOGE09w0m5cLOfDfaZVdAT+80lQYoaasDr2VlRJNa2/arzaq847/SVg + vaf4gOmE+iIK+4ZDHqLcTn1WD6jy+aMChZU/zI31vZ8vM4oPuGh1xbcB3wKP3Vf3 + OTqpGN86CdrdBahJkzNJzIXYsPsRaZ2+8dWTH9gJjI0z+yywQQCrrh9K/oJtDUHF + BwmNc150BoSLqwduSWLtBonCa9p2/y/TDQIDAQAB -----END RSA PUBLIC KEY----- + Ed25519PublicKey = ZQt/OcrDlQZvtJyMEFcS6FKjtumBA9gBWr7VqGdbJBP ''; }; }; -- cgit v1.2.3