diff --git a/flake.lock b/flake.lock index 3b9e05f..affb7e0 100644 --- a/flake.lock +++ b/flake.lock @@ -709,11 +709,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1793258213, - "narHash": "sha256-77LJOHABdbX+cJ332xdTd7LEBoIo9r3lQccnD64p6RU=", + "lastModified": 1793618288, + "narHash": "sha256-owOGoacp52y8Zxq366PhspAx6l76QEKS3ExJDIqncVg=", "ref": "refs/heads/master", - "rev": "5b192aadfe266733c35e40894c27fee716092294", - "revCount": 166, + "rev": "a60a28fb9ceac08278160120431e194d2736d355", + "revCount": 173, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, diff --git a/hosts/m3-hermes/secrets.nix b/hosts/m3-hermes/secrets.nix index 156d399..1d2baeb 100644 --- a/hosts/m3-hermes/secrets.nix +++ b/hosts/m3-hermes/secrets.nix @@ -1,8 +1,8 @@ { age = { secrets = { - hermes-gitea-token = { - file = ../../secrets/hermes-gitea-token.age; + agent-gitea-token-m3ta = { + file = ../../secrets/agent-gitea-token-m3ta.age; owner = "m3tam3re"; }; hermes-env = { diff --git a/hosts/m3-hermes/services/t3code.nix b/hosts/m3-hermes/services/t3code.nix index c4915ba..1e3297b 100644 --- a/hosts/m3-hermes/services/t3code.nix +++ b/hosts/m3-hermes/services/t3code.nix @@ -22,7 +22,7 @@ # - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea # (one-time keygen; pubkey added to the m3ta-chiron account) for # interactive use and git+ssh:// flake inputs. Host key pinned system-wide. -# - Gitea change requests: tea with the hermes-gitea-token agenix secret, +# - Gitea change requests: tea with the agent-gitea-token-m3ta agenix secret, # baked into the same package. # # One-time interactive steps after deploy (deliberately NOT declarative — diff --git a/hosts/m3-kratos/secrets.nix b/hosts/m3-kratos/secrets.nix index 3a580ff..3ef0b27 100644 --- a/hosts/m3-kratos/secrets.nix +++ b/hosts/m3-kratos/secrets.nix @@ -1,8 +1,12 @@ { age = { secrets = { - hermes-gitea-token = { - file = ../../secrets/hermes-gitea-token.age; + agent-gitea-token-m3ta = { + file = ../../secrets/agent-gitea-token-m3ta.age; + owner = "m3tam3re"; + }; + agent-gitea-token-az = { + file = ../../secrets/agent-gitea-token-az.age; owner = "m3tam3re"; }; anytype-key = { diff --git a/secrets.nix b/secrets.nix index 62e628e..a87a079 100644 --- a/secrets.nix +++ b/secrets.nix @@ -55,7 +55,8 @@ in { "secrets/hermes-env.age".publicKeys = systems ++ users; "secrets/hermes-cloud-env.age".publicKeys = systems ++ users; "secrets/hermes-api-server-key.age".publicKeys = systems ++ users; - "secrets/hermes-gitea-token.age".publicKeys = systems ++ users; + "secrets/agent-gitea-token-m3ta.age".publicKeys = systems ++ users; + "secrets/agent-gitea-token-az.age".publicKeys = [m3-kratos] ++ users; "secrets/tuwunel-registration-token.age".publicKeys = systems ++ users; "secrets/ai-memory-server-env.age".publicKeys = [m3-hermes] ++ users; "secrets/ai-memory-hermes-token.age".publicKeys = [m3-hermes] ++ users; diff --git a/secrets/agent-gitea-token-az.age b/secrets/agent-gitea-token-az.age new file mode 100644 index 0000000..29ef75c --- /dev/null +++ b/secrets/agent-gitea-token-az.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDNCY3IxdyA3cDdZ +d1RIUGdOelJkL0ZZTldKYmNGRzN5RTQrSDVGNVE1dW1TaDdoR2xVCjZJTWZqVmFx +blZSemcyRjhXaHBXV1BTN3RNM0xLOVB6aGJlTlBvNnFmMFEKLT4gc3NoLWVkMjU1 +MTkgKytUcWFRICtab1hacXg2OE5QK3FRTlRVdmZoSmtUTThwUVU5dk14cnNnMzdM +RmVLV1kKTzJUNU12VnBzeW9yZjBYUUtmcUNxcmttMGVGV3VYNWhOcldSQkxXSndw +NAotPiBzc2gtZWQyNTUxOSBDU015aGcgdmdxVWI2UG5USFBWR24vRGpKQmF0QXlE +dFlqTFFsWHUxRlpDZitYUE1RRQpxS2cvTURGZUFjNVlwRmRtcVZ6bWhLRTZPa0lQ +U3pzSXhtazMxcXkrRnJnCi0tLSB3OUsyT2YzL05UVWhJMVEwdno4Z0U0WGhTb1Qx +SmNyVWNhZHVOeDdkVHFNCvfBDJ9SzlWGD3URDtM74LvjYRNcb33SCstNhwCYswur +dnu8OawdQeVcYV1dhAMW/16F/n/Nd9MSVkaW4K7tUsOs8XbCHTB7Fxg= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/hermes-gitea-token.age b/secrets/agent-gitea-token-m3ta.age similarity index 100% rename from secrets/hermes-gitea-token.age rename to secrets/agent-gitea-token-m3ta.age