From b5d4f76a1d90bd4a68ab6ec01784695e9ae9b11c Mon Sep 17 00:00:00 2001 From: stuebinm Date: Thu, 4 May 2023 00:40:44 +0200 Subject: [PATCH] rotate octycs's ssh key --- .sops.yaml | 2 ++ common/users.nix | 2 +- secrets.yaml | 89 ++++++++++++++++++++++++++---------------------- 3 files changed, 52 insertions(+), 41 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 1aedd54..e6c986a 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -4,6 +4,7 @@ keys: - &stuebinm-ilex age18wkr3kjalalzrq9l05q32gnlaqr7t6rqqzde307m83rs9fp4xcfsdtj9gt - &stuebinm-surltesh-echer age1q88az2y5hnx8naqsvrurllqj6y5gtehrpa9emmrxy5ghwsr7pvnqf7tfpx - &stuebinm-abbenay age18nkru4pwvvapdw76nauv2xdtlj8cvyv3ugahe9kcxtvtsptx2eyqw7p0m6 + - &octycs-m age1fm3e99tdyrsvztdchxxllt9nat35xzvd68d09y8scu9jfc7kvvuquhr49c - &zauberberg-conway age16fk0m26n0fr2vmuxm2mjsmrawclde2mlyj6wg3ee9jvzmu5ru3ustgs5jq - &moira-2022-06 age1l694a4xht7r0eza9r2vjncupmp6cxyk3k9x2ljwynnur4m2lc5jqmy3jut - &moira-openpgp age1m374x78q9eykua32ldrqxh8rh36kz6jyre69a263krf28hcycsqsrmshl0 @@ -16,6 +17,7 @@ creation_rules: - *stuebinm-ilex - *stuebinm-surltesh-echer - *stuebinm-abbenay + - *octycs-m - *zauberberg-conway - *moira-2022-06 - *moira-openpgp diff --git a/common/users.nix b/common/users.nix index d320bd8..c0ed5d6 100644 --- a/common/users.nix +++ b/common/users.nix @@ -36,7 +36,7 @@ isNormalUser = true; extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDobGLrA6YQAKdJkZMpAsqjlk744G/pCJEvAUNJDuT1Sr59BFKDchPT03exb0o39mjH4iqvw4JDI10RfylKbR1736Ji2yRLlbCzUdgv2CfZc28TAO0rscyT49RHJmzEEE5QD4Ge7MgvFBEmZKXAxntA8M8EbxxEVfzhWp3751BYkzrCbJiHMXcTb+BG9P6rmrraINmgUJxywym5PsMYt2sfHlVus3hSpWnCR/cu0nxmW9E6Tm6CzSkWOXOTdjVuc0Kgh5GXaKDROzJ9K7cJAhd5t8Yzqtpm2xfSU5FVVUH9i7PbXOo8FL82Xi6kWMgdFNLvKimxGqW+bCv3ROlyKWF4I+HQdfdL181KaOQ40jAvjmldrB/ZiEbuWYSBZ/XhxFkKrtBYPDFHq/a5lnH3OvcDm7+/LhwIKUnyZyQ2dXOLOTOEDsO/69xwNveCB8of9o/erDbOeb+d44cXUFpPMUTz4bHXEP6y+zz8TB8/aleGbLQCPUzRZfvazN95jGUDqkumi9B3Lf+W/KpjVUgu3NQsUuJn6khMYW9VefnJvHwzbWpqIzbzNePL4iZFECv4NHPQHO/katajnMbkCie9rfnLk1EjJnrSnZUInEygkW/7Eu4EQM2h7lU4HYfwP1c4ubCFdES0ELGqSuJRwd/ORDbgxbuKOQ7gZ3/lgHdr9KGqJQ== markus.amaseder@amaseder.de" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQqFXSlqW+D4ZtVdCiN9IT461iwyqy2taBRD3qkvXqn m@octycs.eu" ]; hashedPassword = "$6$qQEbD8Ejx/y$6/nkX8CmFBtAlUP/UbFKVMVlA.ZvVbjQZRABqXQjU11tKpY25ww.MCGGMEKFv.7I/UH/126/q0S3ROTqePUEc."; }; diff --git a/secrets.yaml b/secrets.yaml index 87cacaf..1c33401 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -15,74 +15,83 @@ sops: - recipient: age1yql8qaf7upraqy4cq397tt4vgs046hq0v59qymla8t3x0ujqvu4sesgsvw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzNUJDcnZRa0VGaW94V2wy - WmVSV29KV09kOVBjMXFzeURvalNPUEM5OFE0CmxJbmRwV3duOVFYcGh4MTFMU0Vl - SWRoWnhZR3JDSDR5U2h2NDM0NmpWVzgKLS0tIFgxUFhYYmYrRi9XQmxpdWRJYkUv - ekh6d0dXTTRqbllzdUFjOFpncndWazgK1TtGwiWPkgjOZoMY0LC1XDI93kTU6bii - 2xm0MV05TTQWJiQBRxgyk6Vu3ZMVawXsQgiTQiMaamJuI2y+UTSo5A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHd0Rrem03aWMwUGgwMlM2 + dmRJdVYrRVNBTXZrVk5CdEFYcDRyN3VlcUhvCmE5L0lpbzdxanNBWFU1dEprUC9Y + eUZqdHVmWks2V1g0SHZRN1BsSU96OU0KLS0tIGl1ZUg2aDNtREZWeUE5UXlPeHNG + STcwOFgwK1lpWjdyTkd3c0dBTlAyK28KAKL7rPPH0DNRgL3qqCelAoUPnOy8MydL + t2ft9ZmzkoiSdSt0Ad1U5IImQt9ZzhPtYYnYbiEVNcfuFCnGcqdoPw== -----END AGE ENCRYPTED FILE----- - recipient: age1zgdegurzlr8cw9948wgf4q5qh3efltwhhzus5tt6az5xvvsux9us2v4tyd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwREhqS2E3M0lmNVNlMk9o - UXkzZkdQR0p6aVppTnliK3RzNllSakJTdzAwCjEzSnNVTjhxaXUzWmVvSCtidERK - MTB2ODNhbmNtQnBEbklBS3orbDhNdjgKLS0tIGw0c3BKaDg2dDc5ZUlFa0NObzQv - R2NwY2tyOFEwcFRiTy9XOXpmdzRsYkEKzqPoluJCRUGUPFrA/CXPR9OHgB1/9X/W - KFiQDbVIGC7gTjJRIoc7QqUKBRTdwFt/u6t+3yMOhEIMuPgGbP91eg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvT0M2SmdwNmNyWWZ1V2o5 + OHZ4RDlIbTZONXc5Z0FPMm03V3UzVWhaRnhBCjU5dzZlbkZHRkdacG1nUng4S0p6 + Q1I5Vjg0Vk5wRzNGZTNONXdCMnpUTEEKLS0tIFo5K0tGdDZpLzNPb0llb0dJdk9u + c3p5UVBjZWlNVkxFMlVaQ3VMVFdhZVUKxcIL/JMBEojPRlDLHUIuxKcMPMEEsTkS + 0zLjYVZL7YDS0dKdaZjaExHKrRzRpsY0qpDBHyhcyzRae1sWA4e5Kw== -----END AGE ENCRYPTED FILE----- - recipient: age18wkr3kjalalzrq9l05q32gnlaqr7t6rqqzde307m83rs9fp4xcfsdtj9gt enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGUmdmOFU5bUFyOUZWbUQ2 - UnNCQWpHNlpRZGhab2JHZGNvTXN5T1VQSFhnCndkcmlYajZSb0svdUFyTktmWE9V - RzZENlVtdlg5U2RibkFUUU1yOEY0UmsKLS0tIGVXMVlSOTBtWFU3dWI2Tm5lbnpW - Q000bzIvcUpNWEpmb0dQTVlLbXFYUTQK2VBY6N6JqXUwK3Aq0xDZkAVbbFh6bTbD - XYWAG3jj7L+uYmd6RF8DFZaLSVE2xxf8nO3zwrLdZlKuKJmhkw6aIQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwUmFJc24xV2JGS3dzK25F + SVVXTjBaRUxJQ3hXZXlHYTRzaXZVNjVObEFZCmpPQUV1b0lySkUvcURObm1xNSt4 + WVQrbnlvZkQrbzloQzc4NlJCWnlPeGMKLS0tIDBVa2lpUmcrWURwWW8rc3ZmUUU1 + U0pGQjJackNhT0d4L2ZIOTdTUjBwcjQKCRWcpevMcv2HsWC4jyc/GzxxjkTEm+UF + 4QdXjJAHh2QLxV9aXF/k/KogebCFkBTirmyOhRKtBRkt87d1D9FKUA== -----END AGE ENCRYPTED FILE----- - recipient: age1q88az2y5hnx8naqsvrurllqj6y5gtehrpa9emmrxy5ghwsr7pvnqf7tfpx enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtMDVWYXZ1NTY0QVBLd3JP - bmRTc3lRejBLcHl4Wnl2NWNuL2ZJVmxlK3ljCnFtR3FueUV6dlNKaHNkc0ZFMXhC - QkFXYmtuWVpvdENUOVQ5SFR5bTNBeTQKLS0tIG0ydVQybHdvUnhjcGpHR1UwWDFK - ZTdNR0gxYzlzVnNSOXlTQTdNRytKQXMKO17jeAbjljOr9SYwG7RVtwp9jbI/QAQi - Z8zQfloVTLrdzVc3abdvw3v/KcPInI7/PIWp8Anv+djyujzBpOKKtg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzWnZFOVFuTnFTMmpVMDFU + dkw4UFlUenZzNkRuNy90NWk4aVNEd2J2Ukc0Cm9mM2dpZEJpVVY4TVB0WUxmTjEw + VFJ3aHB6ZFh5YWptYTZ5cXVjTUNBVkEKLS0tIEx0dVRPVVVacHFCMDhFNE1NMnZy + cUxicklTUGtPeTlnSFV1TUZqR1VmRnMKtJ+Q80SgqW/Jad8aF7pViGANHCsTMNEM + 7TbhITW+zWIhnviVS0xOqXrvQs4iBbMfiNnQbFS7tEX08AT2oAg6cw== -----END AGE ENCRYPTED FILE----- - recipient: age18nkru4pwvvapdw76nauv2xdtlj8cvyv3ugahe9kcxtvtsptx2eyqw7p0m6 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBncjN3STJ6T2dNMjRlSXFt - S0lNcWdieDJTSFEwc1BkcWN1SXZTNDI2aFM4ClJqSFFhQUVwWjdselA4WlVjRjBH - Z1dCYjVYSzFYYlN6VUlZbUQ4Q2ZidzQKLS0tIFRJeit6NWhVWVdYeEE0dFBFRUx5 - Y3gwYU8reUhJbEh2MWpMMFZiZU43WlUKLVtfVb2UDPTQfrN9YvOsXahNuT0r07m4 - JySi8BynrHY7YsiN2nxMHtW7I/2horgGpu2hv+AKj4WbPJCzSg0y/g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzT3ZNenJKWTZ3NjdqNWpR + Zk9Ya3lsT1Jqd0RIWm8xdm16UjFzcFV1aGlBCkRuMllGSFVIUCs4UEJEQVVGQUxK + L1FGNGJwYkFIdU4wOXdFQWt6RSsyR28KLS0tIEgya2xORURncHlvNHJNTnIrb2da + emRETSt4WGFYeXR5UmNSajNpUStKUzAKxgDME0M1ewNE/BrL/wFjF4Yj7GupjRPF + Fuxae5U3phphzOkflQtreM1ScbUGge8WeiSVWY3Pl1azsYo/yqg8Ew== + -----END AGE ENCRYPTED FILE----- + - recipient: age1fm3e99tdyrsvztdchxxllt9nat35xzvd68d09y8scu9jfc7kvvuquhr49c + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwVEdpZmdSdnBaYnV2RWhT + MmMxQW9PUUJ4enRqNjFIZ25kUEkvdHBpOXdRCmJkSTJyWklhTU5neUlybzR1Nkp6 + YlVHczNwRzl0d0hGalpvTFdEUlV3UHMKLS0tIGhQZXEvd2F0aTlna0FNL2wyaEdC + U1oyWXcza08rTG1DS0dUYkZOVWZ4L1kKgpt6jG0lNBMdk/isa1A/tfKYjprnnIo5 + pi4t1c7CktFBkhMlOv6VPJCsQlP0YtZUh/uut70Kecv48+YH5gC/8A== -----END AGE ENCRYPTED FILE----- - recipient: age16fk0m26n0fr2vmuxm2mjsmrawclde2mlyj6wg3ee9jvzmu5ru3ustgs5jq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTYk4reWJIdVRKZXNwMTN4 - Wi9uWDYvU2daUUVEVHluSi94UkZjNGtINDJVClF4ZFhBeWdINmVhQk5CdEhjRUlX - MlNSNVdHdXZPNWZrbGVQTnVFb1FOZUEKLS0tIFEvTHVlWlZ0dUtPTFlFUlZLTmtS - eTdXVHFRRzJBZTF5aERFUGI0akJxajAKngyn3eyeg2ysKDJC36N9UHrX/hNS2Kv2 - 3Fvnmg/hCQ3l3SvUSPiXezU1xK+/3XMEyaC0p4Tb+YdWapwKre9ZGw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHRzc5WHAzcWhGSU1kdE1E + Z1B0aFhqYUQzQ2ptK09YMm9odWh3U0w3bmtvCi9IcWFhOFhvYU5ISlVpTURMY2hX + RG5mL1gvNkZ1SDdMZTR4QWxtRG1VUlkKLS0tIFl5UUdIR0JOSmF4OWx1OHBuaFJj + N0FDY2xYRlpmaTgxWURGZWxWWktPV00KAHNeeqhzql4LInlJoD9u7ptFWZBgktvp + tju4cZ/78VgdZIfEfnlzw8lsqpRx1z5Fw8K4CcXRJJLRVfHuj2CHTA== -----END AGE ENCRYPTED FILE----- - recipient: age1l694a4xht7r0eza9r2vjncupmp6cxyk3k9x2ljwynnur4m2lc5jqmy3jut enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQZHZ0RjZ6K3djb09INTAx - S25Lci9Ra1lwSjE3WHFkOEszNXRhVG5oTHk4ClUxYklHVHUvSFNJWWtEZlRhYW1G - dnJyMjNPV2RYRC9pMUJPbEhmWXZ0ZW8KLS0tIHc4a3VZYjBraDZlc2lENkpEMHZJ - N3M1MEtXS1RaMUR1VjJwZlhEVmczV00KFl8MTogCwPLJEkN4tJdo+5DVPaDFTUyA - gsk/u1/ud3dJ34edVRf/KfcSjq0YdD2lKhfdwZHCXVNdwT02fbGTmw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBscDFuL0ZsdWxoUFJBd2xr + ZXh3K0lSUnFmTVFTVHB5bGR2TC9lREdUczJrCnFSaGoyUnJjbXJ5d1lQd0RUcFJt + REkvdEY2NzcveHpQRWZ1STBSemx0SkkKLS0tIGtyN0svS3lYcmxUbVJiU1RaK21l + Ukh0VkVaeVBoOXQ1cmZ6WHNkYjQvTmsKG4914d+pSt1seoKiejoCvATOTaVFN4ih + Y74W+WXyaKoQP3Q9QrbSURpE+ICfblxHmkbsPB/agNzZVWrfyBaX1A== -----END AGE ENCRYPTED FILE----- - recipient: age1m374x78q9eykua32ldrqxh8rh36kz6jyre69a263krf28hcycsqsrmshl0 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0ZFJ4WEdQZFBIYkhrbng2 - bmJ0UXM4dTRhQ3BCbFJCUWdZQ1IzY1c5UmpnCklGcm9nN24xb1FoOHd6NWEzYUgv - aFVqMnJIZVE3K2wvV082WUszRjFnb1kKLS0tIE9ZaTY4Z0kzSFhwMjF3OUNhelBj - ejdpTEtMNFNIVWlYMGtuMTJZbHZabUEKBGLoMDZQVwENcAXee8m4fsEmwFl/As6H - 346X4tfBghf1tk857h/1j5sXj3ZgyHvMlIavnS3AoVlOIsgxI1BYMg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqR01XampvRE92VnZ3OTZs + YmJYaEN2eVJOVWt1OHE1bTdua1ArSC9oVm1ZClBsVFBSWWtLRUoyNDF0NlUwaUpo + b0kyazNwRUFhS0RYd1pGNHNENWxQb28KLS0tIDhzdHhRN1FYczZBMksrM09UWUtJ + bndBTXJhQVE2OVlKeGNTbzJlL0duUzAKIWdesesYvBIN/m36fhzxq30+IT8qp/pF + S6i7QqZF75y2BpEoupRCqNIAsHrouUE+U9ZQJZO8m9J591mWvbVJIw== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-05-03T20:47:22Z" mac: ENC[AES256_GCM,data:5ks4oj4ILLZoJ8TAGLSktV+TZBt1igMOVTiRssr00xnMs1OpR4u0wqwbkM3e2vNP3Hk51AHn7J0W+Ex6f3/iuGdcpYmY/nmSuu+IRZkLL7UEulPm+FDUcw9wgifpNQ263LqvmtFmPURpx4jkTdvcKItWrN0ovV0Wk3jspQ4/QYA=,iv:Kp0cJCYSXBBD4nNetXs6XrFVEl77D7oPuJYAS91DEbU=,tag:b3KF/SFJf1TxDBJ+7KmFvg==,type:str]