From 1de5d7a68e03670c832c482f1d179765ec8cc145 Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Sat, 3 Aug 2024 01:08:59 +0200 Subject: Fix access token secret --- hosts/sagittarius/default.nix | 2 +- hosts/sagittarius/sops.nix | 4 ++-- secrets/forgejo-access-token.yaml | 48 --------------------------------------- secrets/sagittarius.yaml | 48 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 secrets/forgejo-access-token.yaml create mode 100644 secrets/sagittarius.yaml diff --git a/hosts/sagittarius/default.nix b/hosts/sagittarius/default.nix index 6ce0492..9e04884 100644 --- a/hosts/sagittarius/default.nix +++ b/hosts/sagittarius/default.nix @@ -33,7 +33,7 @@ name = "origin"; url = "https://git.sorre.xyz/miranb/nixos-config.git"; branches.main.name = "main"; - auth.access_token_path = config.sops.secrets."forgejo-access-token/sorre".path; + auth.access_token_path = config.sops.secrets."sorre-forgejo-access-token".path; } ]; }; diff --git a/hosts/sagittarius/sops.nix b/hosts/sagittarius/sops.nix index 7e13f78..08839f8 100644 --- a/hosts/sagittarius/sops.nix +++ b/hosts/sagittarius/sops.nix @@ -2,9 +2,9 @@ { sops = { age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = ../../secrets/forgejo-access-token.yaml; + defaultSopsFile = ../../secrets/sagittarius.yaml; secrets = { - "forgejo-access-token/sorre" = { }; + "sorre-forgejo-access-token" = { }; }; }; } diff --git a/secrets/forgejo-access-token.yaml b/secrets/forgejo-access-token.yaml deleted file mode 100644 index 785a078..0000000 --- a/secrets/forgejo-access-token.yaml +++ /dev/null @@ -1,48 +0,0 @@ -sorre: ENC[AES256_GCM,data:5mmOPR2pu5CXnNCpTM07MxOmCgGH6R+FPW2FYjcukiOs4OC+c0BlDw==,iv:o9T0TE8gH2BQvibw1KYkojrqQIFcR6YXoctBn4N9z40=,tag:Sl1uvKyCfuR6p57rxj0Wfg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1l088h7umwuxp0sw8wk0stfup0empdnldczxvrhueu7n0vxd0c57q9zvwsk - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4aXpzSXE3M0wwNUpqaUNI - TXdxRndJOXJ0Q05hTXlIYzJ5MTc4dThhOHg0CjFvYmM0TjFrTlJ5QTcreFVqbVAr - SHNzck1zdHhUaUdDTHFVcnAybXdISkEKLS0tIDNNVjZKa0JiMkJUU2hjajBQeWw5 - Q00xdU9xbk5pSk0va080bW9Icng2ejQK7iitkGTEbe4OROpUjwsg+aunMqAWbaad - BjvMNYW+JKdaJz+ofGb+5oPKhwPZfEgvBdj3cgYjqwHSqiZ1W9eQHg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1xzqshnlstewfha28sqjp4lf97mm43axyrhga0vkjmt5zx6eydqhsvlsasc - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEU1FvQzF5cEh2bCt1Tjk5 - MVRKV0F1NmV4Q2ZVSmY1WldNSEJ5d0lZZkRjCm45WXJrL2ZZSHk0V0EzbkpCbXJC - c0JKYnFEZGF1dzk4WDVEZURIV1hUejgKLS0tIHF1ZEVaR1lpKzhhVHRId20xUVZ5 - WlI3VjhLN3hPT05BT0xRd0tOdnhYV0EKv3kwDTelMRfq6Qb9U7pqrlMygalK1QhP - 3A8KVYJ7/mJVzfnPgzGU0gyZTuF8SppbRIJojPALfyT9K0XxVfG0cQ== - -----END AGE ENCRYPTED FILE----- - - recipient: age1jmpdssn7555g0pht7zwqq2dvrvzxyu65w6cf2su8pp2fz0zvaykq0jgern - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZdS9YOEUwbU04Um9NZVJ6 - UjVEdVlsdGdDWWlmUEQvbEI1MzNEdTNlemgwCi8xelU1R2tOZHBKNEpDZjZ3enBV - VFI4dTVuZmtacWRBYm9sNUE3MkJUMWMKLS0tIHhSQms2ZDc5c3Q4c3BtbW9yQ1lr - ODdSckFLdUxsTDlmMHhqWDBCNXV0SVkKfplSalbRQ7Y8yNhIDK3RoIS9V3MaWzfG - BK7MoQfA9uQZ+gsXXLiS7UoujEaiS98QkOYuuecswbje5AMFsdpGxg== - -----END AGE ENCRYPTED FILE----- - - recipient: age1sffhunmeqmeey29lnvuds59mn74jfpctd3wm0t6svca0fztgvd4qnretc6 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzbFltWkdSSFdtYlg3bFBZ - czRWTUFzeEk5OEJxSlllN2p2VjBoOFcvTDBrClJyRUVRNlI1U0pjbnFFVGNGRTdl - YTUrOFE1c2FlWWd6bVpLWS9xY1JDeDgKLS0tIHYwQ09zdnhNMzFBRGE5OWJoOVo1 - dDBPb2Z6dnB0ZVk4TXNVbWlMU3hVZU0K44W0rZaPFfO4PwqbDmpy7liQOxD+9G5G - ge0fhygvbn3ENERvHqXZ5hjJXbklWNwbtjrLFPQx3RVk+U/YBR9rCA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-02T20:15:46Z" - mac: ENC[AES256_GCM,data:0bl/O2yDAeeFmMWoZGZtmc/U2lIVn56Cuc+QuqzkXFjTXOEul3LgcerB2fVH7jDuU8t3QuIaFI+amJXv6Xk8ABsCZu9m/MPJA59oKE2QXw22SroYsSm0kwYklPTV4aaUpJqp8Ha1ANsm8jENXB5lqsiMbfr2biKBwBfiIKmdnZs=,iv:4KR3rPHWWBMK49Mht0V7kP/cx+0N65MdH9Fd/cp5Ph8=,tag:iew6qF/zuC5nzH1Zz7G7vQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.0 diff --git a/secrets/sagittarius.yaml b/secrets/sagittarius.yaml new file mode 100644 index 0000000..0f9b886 --- /dev/null +++ b/secrets/sagittarius.yaml @@ -0,0 +1,48 @@ +sorre-forgejo-access-token: ENC[AES256_GCM,data:NiSfs2ftFx0ZgiEX0U3CFtlQn3+n115Ao64mNBQ8wKZhwO3NYXf22A==,iv:pdk3JPl9eqWRyNM9sbd8UxPYc4Kn6+r6s9ofv9r8Ynw=,tag:Ytm7SkmAwLTVzZjEdP2/mw==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1l088h7umwuxp0sw8wk0stfup0empdnldczxvrhueu7n0vxd0c57q9zvwsk + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTkZYaWsvQVRic1M0Y2o2 + VHVXeS9GS0IybUp2L0c2QjNvS0ZaanVtR1QwCnB1eFBtRlh4dVBsa1FsSDZLUmRE + OXZaU3lMb0lvdEhTdE1lY1RSM3ptdm8KLS0tIGxydEd3UmJOM0s3T0ZuekxMUkxa + SzVOaVJKNTRHZ2ZZZzB1bkpwaENiSnMKP8IurH2lHamASwvQgczakF3YeWRNSg0h + CIvcXkvqlLHDiq3vEar8oqZacjqaKH7ETBPXHgwspl8Di60vUkrLog== + -----END AGE ENCRYPTED FILE----- + - recipient: age1xzqshnlstewfha28sqjp4lf97mm43axyrhga0vkjmt5zx6eydqhsvlsasc + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuVUdPNWVKU1NoNHYyRzM2 + Y0lIWXNBU1BIenF2TEo5dTd1b2Vtc3dabkQ4CjJCV2pkTmg0dUMwdmtDditnanhq + QytDQStxTHZ1OExpZHBub3VWdTNVcGsKLS0tIDdQNytOWUI2RndVVi82eE5xOXo0 + Y3BXTEk3VFZpTU9uSXp2d2tPR1RFeGsKY2NsqkoVTC/IA/4byhKVxI+dg8+kcQwy + UBlrN013NCsultkwyv2wfsNQDyYRsfdfACSW6JVjwZ3NSp2Yydwt/g== + -----END AGE ENCRYPTED FILE----- + - recipient: age1jmpdssn7555g0pht7zwqq2dvrvzxyu65w6cf2su8pp2fz0zvaykq0jgern + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTMWZFVm1qRDdtZXNCSHFC + U0JMeCtwdDV3dUNWRlIvN2tsZzZWdXROWlNVCnV0V2xUUXR6SnA2S3RMS0FDOCtK + N2ljallTYXlNYlZIOWpNY0hEaWpmYm8KLS0tIFRia2J1aU5DRzMrLzBVbmRpMFlP + cjIzQ3d0WnoycEFZczFUOW1jc3ZoWTAKk02qlpQZ8/J5MHJMG/Leo6ZgO0F7ipCb + AnafzZy76cPc1VkOosO4x/h3czSAg8tkuNfl1e+4gbT6gYdrEWv2iA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1sffhunmeqmeey29lnvuds59mn74jfpctd3wm0t6svca0fztgvd4qnretc6 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTc3NwRllGaDVaTkk5Vlpa + Tld0U0FZY2RRWXFsczU3T0YyTndRYlBrelRnCk1LVEg0S0xkaVZ1Ui9wa1krNGUv + VDNEcFNwcDdmS0NLNnVmc09XUlpqWWMKLS0tIGE3WjBmbDBRWk03eG1RTExMbFBR + MVRWc3RjdGFmL0Z6Q2hpVWdRMmlNdmcKBii4ptQOfJHrPy7rmgJX7vsR2bzuXBAN + X9YJmYU6G/Ft4epJ1TMADvp/4fdwB48u2jQx4cKUimNVJgStt1NA8Q== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-08-02T23:06:43Z" + mac: ENC[AES256_GCM,data:3V53/RKUs9thrgMr6C0yQTrMp63N7WSd8Yh77HahpIRpVJulSy2+jT4kYISnxVqiHMu/LyVQACLqop+rm5TPHGTlu2G0bri+ZGIcfNmZp5e/LtQAJAjar5+Rgu1Ed7fZ2w7FKGvM0VIVr9lWKx69MVEusVE0kfZWfBac2eOuJuY=,iv:5eNR9CNI1rn19K6iW26gAo8ihmIgbflMt44tNR7inuM=,tag:gplVDG8dmRFY3NkBvSiYFw==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.0 -- cgit v1.3.1