Merge pull request #535 from DarkKirb/fix-mmr

add signing key path
This commit is contained in:
Charlotte 🦝 Delenk 2024-09-25 16:15:49 +02:00 committed by GitHub
commit 3183098443
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions

View file

@ -17,10 +17,12 @@
{
name = "matrix.chir.rs";
csApi = "https://matrix.chir.rs";
signingKeyPath = config.sops.secrets."services/matrix-media-repo/signing.key".path;
}
{
name = "matrix.int.chir.rs";
csApi = "https://matrix.chir.rs";
signingKeyPath = config.sops.secrets."services/matrix-media-repo/signing.key".path;
}
];
accessTokens.maxCacheTimeSeconds = 43200;
@ -120,6 +122,7 @@ in {
};
sops.secrets."services/matrix-media-repo/access-key-id".owner = "matrix-media-repo";
sops.secrets."services/matrix-media-repo/secret-access-key".owner = "matrix-media-repo";
sops.secrets."services/matrix-media-repo/signing.key".owner = "matrix-media-repo";
users.users.matrix-media-repo = {
description = "Matrix Media Repository";
home = "/var/lib/matrix-media-repo";

View file

@ -24,6 +24,7 @@ services:
matrix-media-repo:
access-key-id: ENC[AES256_GCM,data:qFc3bua0z3cCydNwoM0hA9T3zbI=,iv:zox8zBO7p+CpyHUbXt1WIbsXVtJd16L5UHRS2HAGLpU=,tag:Rv/F8TmcLm9gIz8YMrZlCQ==,type:str]
secret-access-key: ENC[AES256_GCM,data:DiQmiDXGkSe1oFUrv1oDAAp0P5keo84BXMusSIGaRmeMNw2/cKy0tA==,iv:nEhRuPBgYY7/mHJwB86qzuZ9bgJBX3f5PJU+VdIRAuk=,tag:laAam0N7/0e8I7J/BiiNpg==,type:str]
signing.key: ENC[AES256_GCM,data:cPSrAkJQi70SiLmEpdah6nh6X0pIbMfXk+NuAQFtyqIiewd5jA77UhUcYod39y8B3smQFMtnrlpjCWeWUpO1c7UP23KzbFMWaM2V6TBri+lglGhTUO+dKWSjDc//iSu1BQMYXkPX0aFw/LLtf5ZVLKuKcI3sLtygxzz//6kK06Yn9T1BRclgXLjaHhNNLA==,iv:tTqi1x3MGdnupjCwkDGWD+qWYBt7ui6W2Jmnqv1/y5A=,tag:yENGVcEKtz4tl+GjkDQfDA==,type:str]
hydra:
gitea_token: ENC[AES256_GCM,data:NkEXwLbofK2QnWrUuxY5QvUkYPWzY7Brsgl9FvV5Me0J5mWuHUc0Dg==,iv:UhA4JUKV/+D5lOTAx3fC+rsr61lYQJRioSyKQ3s1e0Y=,tag:E/HB2S90o7dLmeWBLsOP9w==,type:str]
gitea: ENC[AES256_GCM,data:J614G1lGr+XLRDrXoQtMHDFKrweRHWX5cvB6h4mOV63lRJEKB8c3/w==,iv:+no/ER8Ef5vsdBBT/evfguTwj3nc6aFFcOS16USEqgQ=,tag:LjNY9bRPCu5qM4ngowAlmA==,type:str]
@ -84,8 +85,8 @@ sops:
M0tUV1E2dndCTXRsOVJBU2ZNVHRFS2MKhBezoPFc0mdXassxViUfsmFTQCVbP1Js
bEpByfdW69GUCjR0HmcjF3NX/Cd5N5uivy+yLp3IrincHAz8LBIXyw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-08-03T09:43:57Z"
mac: ENC[AES256_GCM,data:UepGWInhglReBZdUV1gu64JWLl9LQ1vFfSFmcUJIzll+tBIYy6A4Hf0vSS25cFxdufwOvAV3AAaQgtXbfrSw46AIGPwbbwyLABD1SbO+X6VrtApVIPbS7C+c/jqyxjFGCzNrADEZ6OMRyds23Yik55wmz0wYil94Jx/11IXk/lw=,iv:hmeVbzTmHxhN0c13vS+/ZKxkvbnVxaez62I/D4Y/BEg=,tag:B+0ng3yS7qS95U/crsVzQA==,type:str]
lastmodified: "2024-09-25T14:02:56Z"
mac: ENC[AES256_GCM,data:gvQ4L/QK7gVHs/qetgoHy1sn8OaD76dBM8xMu6smmuVHRvfR2tAUre37Pyvr2jpStQXvqKHNZ6BlHfg/7hO9XUA52Hy2LO7c4jf35TUi7D7Ivuch/YGjtTlwLX2xJmbniUhZh27jlYYqMW0Ta1pUKi4I8XwRymqV7zVtjV1oq1k=,iv:SbLJjXBPk442nyAtZnErqO78QTQdB5mr4eYEI6gSDPo=,tag:Qysv2ZCfJviMiwBfW1CIAQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.0