From a1d9947cb7ea7024bbf24510cad34d7f67947831 Mon Sep 17 00:00:00 2001 From: ahtlon Date: Wed, 12 Feb 2025 20:08:57 +0100 Subject: [PATCH] move fanny to db --- machines/.sops.yaml | 9 +-------- machines/fanny/disk.key | 31 ------------------------------- machines/secrets/keys/itag.kdbx | Bin 1589 -> 3541 bytes 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 machines/fanny/disk.key diff --git a/machines/.sops.yaml b/machines/.sops.yaml index a81bca7..879d051 100644 --- a/machines/.sops.yaml +++ b/machines/.sops.yaml @@ -12,7 +12,7 @@ keys: - &machine_infradocs age1decc74l6tm5sjtnjyj8rkxysr9j49fxsc92r2dcfpmzdcjv5dews8f03se - &machine_overwatch age1psj6aeu03s2k4zdfcte89nj4fw95xgk4e7yr3e6k6u2evq84ng3s57p6f0 - &machine_vpn age1v6uxwej4nlrpfanr9js7x6059mtvyg4fw50pzt0a2kt3ahk7edlslafeuh - - &machine_fanny age136sz3lzhxf74ryruvq34d4tmmxnezkqkgu6zqa3dm582c22fgejqagrqxk + - &machine_fanny age1u6ljjefkyy242xxtpm65v8dl908efnpt4txjkh0c9emvagdv8etqt22wll - &machine_nextcloud age1z0cfz7l4vakjrte220h46fc05503506fjcz440na92pzgztlspmqc8vt6k #this dummy key is used for testing. - &machine_dummy age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng @@ -73,13 +73,6 @@ creation_rules: - *admin_kalipso_dsktp age: - *admin_atlan - - path_regex: fanny/disk.key - key_groups: - - pgp: - - *admin_kalipso - - *admin_kalipso_dsktp - age: - - *admin_atlan - path_regex: bakunin/disk.key key_groups: - pgp: diff --git a/machines/fanny/disk.key b/machines/fanny/disk.key deleted file mode 100644 index 7a30f5e..0000000 --- a/machines/fanny/disk.key +++ /dev/null @@ -1,31 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:1I8fN241VOaW4GaNUe/OVr+1HQKmtYL1GSuIfsE=,iv:aHdgEUj5QhusEavG9mVgtTQ4uqLJD2ozQ/kVVtFakYY=,tag:JJUbt4kgpa4hVD3HjLXGOg==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEUGpORk5zWXU1OVpqc2hT\nVW5PYlNLT3lKQVpTdCtMT1M3YlZ3Uno5bVJjCkJXR3I2Y3lDT0dJNThCcDN1NXYr\nK3VucjRKU0dac3BtQmV5ZFdrZXkrS1EKLS0tIGRGMGxDM0ZGbzVPTnJQK01GS3VW\nRHpJQWZLU1lrRS9ScXM0L0dyTjhGTGsKJEYq5vKxxYBAgkqUEkBwESur0reNIDPb\nK3rtflNi3dUYYZdLFNFV5rQX5q8aDnM6fO/zYPkzfBn7Ewq3jbBIIg==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-01-05T19:35:48Z", - "mac": "ENC[AES256_GCM,data:z7elJ0+3r0bWc/H6h4rI36xC7Uj0NS04VssjPDNVZM17LeN4ansSOfcOKPaUMziV/z5Aq8RVLROR+FImzxBZGaZm37frCoN1OP3WjeDnP6AsoY9dY+S/aYmErVEsQEIi8T4RAdQP2c3BUt1oKZ9Nki2pu3IBRabBlFhaTI0bspc=,iv:8Nn8r9ancHwBJOaJSsv8Vj3s+d0UvRmKIeCDNzx1qRg=,tag:BSO2yu70H2wjen3BCGC4Gw==,type:str]", - "pgp": [ - { - "created_at": "2025-01-05T19:32:11Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhQGMA5HdvEwzh/H7AQv+JpNwP+BLJf4+0pSr17TToviCo0yWmcaP1dIUqClBSoDO\nI3ZzqHdImAj4QgExif2zsuzz1+WC+sjvFqEmX5pBKza/e30qCZirkelz9mzc0mhG\nLhTzfhqC6fLbV5f+pDp6N40ommu+LX1pIz6nViCUjqBdnAkCb+tqLU4eQJQqVmlz\n7BToLsvYomPK1nJ6f4rt1nTR9wkBI68AYM/K0SgCJXjwj1LpZ/+3yElkiCqZ9uZB\n1jrDKX+QPySlZ7OERL70UT7Eh8DTUNzFnozvliBnyxe00wwiiucCgrC94TmaKCmh\ni/FOdS6Izm3QwcWB0eMCX6GQBvlUWpjSz5xF4+YODJe9tGNz/sNxpk6B8xG5NuG2\n61nohMHoml6X3Z9dOwu/Svl+eS8SV/r278W/F9miE8YeayyLlPxHF3DXjd6WeDhZ\n20NExQUJYIRf6w/XQPQZ+E39NkIHxz8v+P29ncmSsRPWS6d2MK0Yj+UW0vT0u1vJ\n+lAs24xYofbu5tmBbnK10lgBrZMXDJM2nQbKMKSkVVjzbzmOe5jzMBxuWLX+ykeI\npaj32wQDWvfBqLPH1Kwvy5nqHvy375jPZ7RTzT7W0d4jKQf7xapbi4CEepHHfxCF\nD0HIEi8RUlXJ\n=KVUJ\n-----END PGP MESSAGE-----", - "fp": "c4639370c41133a738f643a591ddbc4c3387f1fb" - }, - { - "created_at": "2025-01-05T19:32:11Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA98TrrsQEbXUARAAqowFMavIniFheNvt03EH1iEn64xNmExotYcDt2L0bR39\nXQdLvg7cJ/Jh7EuZ44mHTs21mpbYIlygMs6kimqQ8iO30vGTEcn5bt/eUEoGHciM\nYVHktWNR81ZgjvKCcmTUK3ld+DMKmg2BABr4auUOYLu4ToSnFb1fv+fvZG0D3iQs\nm6LJuafH+4utM16Vnkp9+ziY/ieMPYfbOFuSFq0UWxGK9P+koSYVGnYhH55Lksyf\nBb/esEGCY671/Jl/qHw8so4TELeRsW/v/xAcNqbE1Msdeas7WJy/B6WqXQgK/Y+J\nPsyZ2XHKhPRitN77/eDJXVBi0mKBTE/RCzDzMYxKA7IQm28v8+u+wpdCajewnyF4\ns2HACaYs/TWRpIUzqxRlznc0nMpk8xUaeVb0N7nrtSDEBF8ETOGOcPk1AmdKMR4M\nsy0vu+K2oJ9L7e/o1ntpejKHN7t2Lzq+CvszBYKmyw/KgxeqY0hx4cJTUDsdgLjI\nMTrs6bySVXDyRaw3rHo7OvA+5c8dLfnWJd1R78nZTx89CYCvjJeMo7PNvN6C9HxK\nJoCOCnZo6a3j4NqJvXD5GNqGSP6m1lqBRWYQUIhWaOfz8aTY1Z3EXX0/4tv5C+A/\nknhc694ujtmBXio4XgDIrSz3jr9G8+ZLvig88xV12HTJfsatypQdHVIZj08EeR/S\nWAG872Q/DVD/aDmhaOlq/o/QBoEyrnJdkRHT9NX8iBboQ81wezfJxWUWlWyHaXVq\n5YBLFQvQAZLz3h05EBkMOiS2dHUa8OnNImj8txnCePAlcUdv7LIVxHA=\n=9APA\n-----END PGP MESSAGE-----", - "fp": "aef8d6c7e4761fc297cda833df13aebb1011b5d4" - } - ], - "unencrypted_suffix": "_unencrypted", - "version": "3.9.2" - } -} \ No newline at end of file diff --git a/machines/secrets/keys/itag.kdbx b/machines/secrets/keys/itag.kdbx index 1669d73b7b0916bfc99a93c566785485e596fb70..be8a3e1bfa4adb36809734be1ea36a47e7eeaa37 100644 GIT binary patch delta 3464 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 G^8o-0pRo4; delta 1497 zcmcaAy_JWP`R1Zo>A$_VGEC%DGu{3`^iO*F_ZJb8vzV8fAA6sg#8+&#SXrAhYD%IW zZ|OmH0R{#J{jWaS#=?$s`8M*O)mhZMa$<@BBh$pGO7#*93=B?;3=9mx3JeSk)_WJ^ z>{j2cUe{pn|6m;h`}2xdN55O0>oc8S8gS0$e+3IjWf%(s1A{OF2!L3;T)bQ*GSB$Z zSwGJ4W^}%hv&ql!>$#KHe{C(7J9%S&#otah%QzK@-t4yT+5IVB`6u_g)U`g0OVn7? z@#KBI-yL1v`wvUzEzeX;dfYIlr~k?1itPz=f(|a;rf%FXqO@(n(-SS}cQ>#wFsyqb zEEicN_;BKz|Fi7HE=j}*PwP~+nB}Eu&T;6{51uH?KRm*o^L)yzu3KF%yHj&jc~Y^; zjsDb&rq9?@Vy#p+2K>$16DhLy(OL0`zz@gFu1>D5dR71JYjMMKueGiRnzuXdo3!lo zk;lTxVb{dhKgwDl-CWK4;`+bGSxnBEhxxtC#cs83`}wEt$w{jnXGAUsObk*>=qq%o zzWJTCUcR(-x?lPCd&R5M5_v*@ZsJI|uDvJZ=$^f+=Vsi`)O>KG@Ze$Th`!AS1SU>0 zxHI9H=-iu2bv)*NRH)aq>nxWwFWe&?xLEz*M`^~M@UW`}M{hkc*WGKdoWvCPTU6X|(_Sf?mGd|!yiD_OxY)Kt#j)?mr;KB(Zh0p#wXXIHytuw0 zcH))gyhi;`4<&21X&?B1YRid#F87XB$8KBf@YV3p4h8=c|9CTd=07=NRX>~U!J}7y z1-vwLx!mqQSunMyFI8jegIZC+Zq2)v(~I{``5zcoQ}ZP)Rqn~j6+g`N#f)O5lZ#{) zK8)Nx`KQm^^L2J_u3n$}g!f62>O+zDD)HAoPMW#v#JVdr&4=W@9{BO9DsBA!BgX33 zEWvGiN-O&>Y+4X?XTpMgZ~Bh$JvsPzR(ULHMmX!|POLg|}_KCy29 z)v2!|8Jl_b-?Swx$>DGFeXrhoJ#EL9@~ekq10R33ie1&Dljq%Y;d^g*LBWDkOH#KN zavqqSb8yb0+zVdZY6csUCpzmJ#)dq*@@k*Rmi+lYqQg8+mp;?q!m_HxVry8K+!Et8 zT?;qYe)?*! zscz5l4H?p3?-l=wpKvZn=w`(HjXZOiHoaTL{if_?pyC(R`s;Cw4%27J+8gp75i~!! z?GQ^#{pw21R1(%b}Ab3hFm_67T->z83d{+m%P(B)#GGP1bwM;S+miVNl}oi3bhrxMzL3es*t@Z-nZU zwOe#HN?p*kpB*X7RkgT2^IPCMryW_`oc$lJS^NuMt|Bj$E1`XJ(K*fId8hb`Pv*(l z8=jiYbNb<(yT8xsnm5(FT_TZncgnsW{C8>tyHmI&IEAZgisW~0H-2vLr@m9f^038 z{u`Uja-P~BrdQnW{@Uuiu;j*%jlpkScb4SWD8K1`%p#aOAw|OUSHEBEDGfoLdnGrv zXiu$H{i}F-iO+QZm%-ZXfoHY$1ZFqXKRau4AV+Riutzqh(6grp^kc*)9zI_XDgDHk z_0X9Vl~jWp98TfA`@W{zwm$5RjST8#TXXe7xwT@&W3TL$!cED7pUe6(4fo%k_>=ux z?xl7yWud5+f>nw-hwpmLH