diff --git a/.sops.yaml b/.sops.yaml index d8d595a..da78eb3 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -7,8 +7,3 @@ creation_rules: - age: - *pds - *server_roost - - path_regex: secrets/igneous/[^/]+\.(yaml|json|env|ini)$ - key_groups: - - age: - - *pds - - *server_roost diff --git a/modules/atproto/sops.nix b/modules/atproto/sops.nix index 87709ea..280c56e 100644 --- a/modules/atproto/sops.nix +++ b/modules/atproto/sops.nix @@ -16,12 +16,7 @@ nixos = { imports = [ inputs.sops-nix.nixosModules.sops ]; - sops = { - defaultSopsFile = ../../secrets/pds.yaml; - age = { - sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - }; - }; + sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; }; }; }; diff --git a/modules/atproto/tranquil.nix b/modules/atproto/tranquil.nix index 4094e31..732f8e8 100644 --- a/modules/atproto/tranquil.nix +++ b/modules/atproto/tranquil.nix @@ -18,10 +18,14 @@ environmentFiles = [ ]; }; - sops.secrets = { - jwt_secret = { }; - dpop_secret = { }; - master_key = { }; + sops = { + defaultSopsFile = ../../secrets/pds.yaml; + secrets = { + tranquil-pds = { + format = "dotenv"; + key = ""; + }; + }; }; }; }; diff --git a/secrets/pds.env b/secrets/pds.env new file mode 100644 index 0000000..8c1815a --- /dev/null +++ b/secrets/pds.env @@ -0,0 +1,11 @@ +jwt_secret=ENC[AES256_GCM,data:/Cqqn7PU84r9vfbxjoZ+nf3hrSpZdMHOJzFVlYjlGUB0kLLPFDtTyMobwkM7yGu1iydsz+nNCbntHQjOJ0baVw==,iv:Fsh3owArkyQvPeN+mOFpxAlR1mK7yRc8D5DrAvt0D/k=,tag:dNt0Iz/vfsFJwW3y0ILQLQ==,type:str] +dpop_secret=ENC[AES256_GCM,data:haDxLHR53s7ZEV1RkjUS1XSr+ROm5ZslRBqha9cAoV2TWy4uTunBx3ESAF7icaNC4aGPDwkCxA1TfeMjTFgTqQ==,iv:9c9WelMmppNEJUeWkf4t8WeqajIwyQ5nenJ2ZhAQeDk=,tag:8eRFwctBge8mW35VgNPxrw==,type:str] +master_key=ENC[AES256_GCM,data:ERGeEFzjfObcBOJZNrlEjoAlGINTHivAyCBcw12hRTVnASikIH02lWwOmH4ibGgwUFDBT2vDMTc4s3bb/7g+KA==,iv:vfSBI+3yug8WMnq+tsO/vy9VIIlKMcg8oWORys9Sgmc=,tag:I5J08hmMHGomdFb01qRBjQ==,type:str] +sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOaHczeW5wdUVVRlM5dCtV\nTVZXWFRLak1UREYzYklVTVgxWGRYS0xYQ3dJCk1zdmRLb0xNN2xzRlVSaDREb2p2\nRFZ3YlgvSHphM3NtYXZBRGVUVS9zKzQKLS0tIFQzeG92Vkc1NWdGTTE0RVkxNXFN\nZlJFMWN2RndWaGYzaS8ybkVJd3ZOY0EKqHHPmqzrGg4MKRzYmD2NLmGt+r9FvQwg\nkUu4W7a12qHXdsujt1730OmlL6jJUp9sRnw6kPRPaE2Hj5Fzj81Cgg==\n-----END AGE ENCRYPTED FILE-----\n +sops_age__list_0__map_recipient=age1j0jft6cd5h7g0lq8hxkuq3ysrj6wzkq0gw5yxlh5aklsqdth644qapy6tg +sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUQUxWYkVRd1NSRHJ5YVY2\nRi91RUhObmkwQ0lXcmEwdUU5OTNTdG1IOFY0Ck0vTTRSRkVKVXBIcDMyVFFRQWJY\nVXFFdzZ1RHF2clZqdXJ3R0U1YlFWZ1kKLS0tIGJvWkVjbFZsRFNTbmxwY0JqOVF5\nclB0SmNKM1ZTa0p1ck9IZEV3RkpKSE0Ksofkn3w5RCkBHhmb5ZmzX4e6CZDed98V\nM9l8YcxlemR+jj9ebcQvKEZRWcAHmV6Bsh+BV1jWin2mMoOx11wiRw==\n-----END AGE ENCRYPTED FILE-----\n +sops_age__list_1__map_recipient=age1t94dyp6exjjex0tx5rhznfg7ua6jfgte597ke4wtl2hm2a472dqqpdf9z8 +sops_lastmodified=2026-07-01T22:00:59Z +sops_mac=ENC[AES256_GCM,data:F3Fz+bB0G3LHw6+xy6+Lyo7gwmfjRxc8zgKUnqtHVHnGBGaePJCIwrnW0m7a719dVqeoaX20zJkm5mP36vFvGmuSkOapfa/vSNcMJUG6txURV5l/0Aydg872X2lyQ85371ENM4GQhQnMqDzUZlBex6R0Sfh5DGMPhH3uPdSPf7c=,iv:ljWM/oAHw3188gRl15h66BPsL5j9KNFtdep5LIWVtlw=,tag:O57Ir0qV4Q9qspDxxJYWBg==,type:str] +sops_unencrypted_suffix=_unencrypted +sops_version=3.13.1 diff --git a/secrets/pds.yaml b/secrets/pds.yaml deleted file mode 100644 index 75d7fe7..0000000 --- a/secrets/pds.yaml +++ /dev/null @@ -1,27 +0,0 @@ -jwt_secret: ENC[AES256_GCM,data:TchgnA9lmRxmxqVSVNybPr20zyruo+qErokHzxANcgXSkD8oaE9Ldi9R6LKTTOi9gjLEX3yp0L08ZyAQ8imPXQ==,iv:+9+K0+xoy0+qND2YBQ73PaYMkRd1Htshmyih6SveM+E=,tag:fk0brk8CmyxENH4y0+aq6g==,type:str] -dpop_secret: ENC[AES256_GCM,data:BH9XEwwAykLL56tz2UWX8J3WEvM+tkQm43PW8sdv8J/JJkxGkqVIIsXDG1nUcZErjA2hs0J0ebgG6qVVDKvsCg==,iv:GQdzzoB/FY8bK5U0yBInKPof1uAoU9PqoRP4Ixjol10=,tag:iOFiYDQtv83DWVzAkv1M1A==,type:str] -master_key: ENC[AES256_GCM,data:bQ42PHnWX39jZHp462HldzgkYcvmOTs6SDciwJr3wxg2Z2R3rDfeE0jfv5C1IfKi4oeYTI1xzx2quqFRfw6NxQ==,iv:no8pQGbnXFjrcY9pqakBxnJwkKbyhTJ3NNcOcHJqftU=,tag:ZqFjMckQdqiNQ3js1ggkRw==,type:str] -sops: - age: - - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpeTFEMjlkaEV5UWw3TFVC - MW5ZWWZUUEkrT1hmTUMxOWtzUmVHWHI1MkNjClE4QmMrSjRaSEVIL3BQK05zazJi - NlRmYU92Vng5b3FEeGx4U0o0S09FcjAKLS0tIE1FSEpCNElxVllwVS9EdlY1OEM0 - bkw2YkJWRTlYK3g3akI5SlM4Q0NXWUEKirJB9sdcQJtylWQNK72Y4iWXkxEsPTZU - 2WY+bX9NhsdM+iE3dqIrna9LYD/2lRxc9OnriF4sVVQO88aWxmKlIg== - -----END AGE ENCRYPTED FILE----- - recipient: age1j0jft6cd5h7g0lq8hxkuq3ysrj6wzkq0gw5yxlh5aklsqdth644qapy6tg - - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzOENtUVIwaWFsZEJLQkZz - YXF5ZWRQQ3QwYUwrTmRZRFRTRjduS3IvTDE0CnFJYjBoemtHY3c3dGZqMUNLUWlY - S0xZcXkvR2dMZnUzdStDTDQzUmlDbmcKLS0tIGUvT3ZUMk40ZW9DYkI3RHZFU3BO - QVJWME43Rk00cXFxdHY0RUU3TkhiZjQKtZBCmk+C1Xt1zBBAOmCAk12W1Vx80Mh5 - VG1CjmQgkOA/0CZ3bpLFH/ZvYvIDLHzrE35QlDkstdTeTndqh5nC8w== - -----END AGE ENCRYPTED FILE----- - recipient: age1t94dyp6exjjex0tx5rhznfg7ua6jfgte597ke4wtl2hm2a472dqqpdf9z8 - lastmodified: "2026-07-01T21:30:04Z" - mac: ENC[AES256_GCM,data:bKARPmIg0KWcP4VpuPucMmxZLO00WWQZmO0tHZU/vPYXaGCyHJ/Oz0S6egG57E6AiniylFBLM1fBPwYnE8svXTZvRbfSSM8+4YhheXWZ5ziQ5l8N79CqhPKU5G4GotQ6REL+Rv0oYNjHnDCxgjg7eE4NMmPsbLKby9a1kj+FPBo=,iv:swkPSQ2M6O33ToX7kWEXDE2fDGVyyozmw0ae6uUYYy4=,tag:3s0deQ6dHcvpqJQTE+zQlg==,type:str] - unencrypted_suffix: _unencrypted - version: 3.13.1