diff --git a/.sops.yaml b/.sops.yaml index 2370d58b0..4003ec685 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -38,7 +38,7 @@ creation_rules: path_regex: ^hosts/build04/secrets.yaml$ - key_groups: - age: - - age1tc0yavxcq9hnf8rl5akv4twzaqkz5p9g80r2kf8cdv4urxgm4qnszccsy3 + - age15dljvnazm0njdt7fh7drlsqnqx35766aex8zsv634zzpecu9cdgssmqv9a - age1dzvjjum2p240qtdt2qcxpm7pl2s5w36mh4fs3q9dhhq0uezvdqaq9vrgfy - age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz - age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay @@ -77,7 +77,7 @@ creation_rules: - key_groups: - age: - age17jtyn2y4fpey6q7ers9gtnh4580xj89zdjuew9nqhxywmsaw94fs5udupc - - age1tc0yavxcq9hnf8rl5akv4twzaqkz5p9g80r2kf8cdv4urxgm4qnszccsy3 + - age15dljvnazm0njdt7fh7drlsqnqx35766aex8zsv634zzpecu9cdgssmqv9a - age1dzvjjum2p240qtdt2qcxpm7pl2s5w36mh4fs3q9dhhq0uezvdqaq9vrgfy - age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz - age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay diff --git a/docs/community-builder.md b/docs/community-builder.md index 592835327..662c21d22 100644 --- a/docs/community-builder.md +++ b/docs/community-builder.md @@ -9,7 +9,7 @@ build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63r `aarch64-darwin`, `x86_64-darwin` ``` -darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZw+Zk6dKiiXVx2Zlo67b6uQ3o+BhPn9UU9BC6SIgZ4 +darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMHhlcn7fUpUuiOFeIhDqBzBNFsbNqq+NpzuGX3e6zv ``` [_Note: currently the darwin build box doesn't support FIDO keys._](https://github.com/nix-community/infra/issues/1007) diff --git a/modules/secrets/community-builder.yaml b/modules/secrets/community-builder.yaml index 63f5bf93a..60ae11a12 100644 --- a/modules/secrets/community-builder.yaml +++ b/modules/secrets/community-builder.yaml @@ -8,65 +8,65 @@ sops: - recipient: age17jtyn2y4fpey6q7ers9gtnh4580xj89zdjuew9nqhxywmsaw94fs5udupc enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBncEk5Z24zWERTMkxPcFhu - elVBcC9ibEJpcXJySHkyYVNJczhsZG1HcjA4ClI4WDIydVVmTzY1Q0FIcFlSdWk4 - RE42VCtrT2NTN0xZUGs4czhPei95TUEKLS0tIGovQ0M5clpnNmNaK254MnVpUFRE - cjZkOVNTQVhHQTdLVm9IbWd0QjJMNzgKdO4ceB3p617WxnKC8Y4KS3ymVBs9Tc+z - nMQ1L8tdjib83AR4v637qG59eWmDUZ1ACwARrSFM2KrNaJhhuHwjRw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyWTFDRmkxY3RrdVhSRTNs + S0xIZmVDL2JoUUtKSVZ3OVVIYXFYaGxrcjE0ClFkcWJ0QXdEaC92TDNVTDVIai8x + dTlDWHNwbVhMVUYwNXBsUGRkaWh5cUUKLS0tIG1KbGs1UDBSMzkwdFZBT21Cb0NG + Zk12UWYvNk1QeHlBcGpiTDRkanpBU28KqoivHFiyz05/c7+doZjsAZdqYaB+0zsT + P0gFhZSM39remjEhNEwuAMbvB0CPwv3yHk544FmYIhNr51rYBTkyKA== -----END AGE ENCRYPTED FILE----- - - recipient: age1tc0yavxcq9hnf8rl5akv4twzaqkz5p9g80r2kf8cdv4urxgm4qnszccsy3 + - recipient: age15dljvnazm0njdt7fh7drlsqnqx35766aex8zsv634zzpecu9cdgssmqv9a enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1MG1vNjJxK0MxL2tZREx4 - am5HcmpnbGZ2Zk9PdU1IdzBySEZuMnJHcTNvCmtuWlNHWE5LRGtVa3pIeTcwbmRE - VHJaN2VmZDFoWnlkYkc4WVVqWkVyWTQKLS0tIDMzUm9NT3FhTjE2ajJmbDBFU0RZ - MEJ4T2xsRkI4QTZQWlNRYWhCQXo4ZU0KQJGmC8wAYI09M8kpT6ID2EIYVj55RK6g - 4WRRCxVQZ900fXYVqslMOR+kr9T9lM5tVSNwXUFaJYktB1VuwcXewQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1cWhnNzZJeG9qU3kxZEdB + SExuckNqZlc0SysrNjhEeWgvRVhUTm1NZGh3CnhiaFFqeTBJN2k1cnV3WHArb3JO + aXNDYTFqZEl0SnBIQWw5MVBnV0NrUWsKLS0tIFBBSE4xZ3NjNHRqV0MxNVBMbzNK + WWlMQjR0Zk1MT0FKYUc1MXlVV2M1TGsKub+bwfC3xT8UXNUsomDZ48+LITwrzutK + 59QJgqvikxLJEeo0agdc2A66A9UxgeFJQ45DWEDDCAu/Ru8+6f0QnA== -----END AGE ENCRYPTED FILE----- - recipient: age1dzvjjum2p240qtdt2qcxpm7pl2s5w36mh4fs3q9dhhq0uezvdqaq9vrgfy enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBReDREbmZVVGF1L0ZVc2JF - SXpVcGhjalNHc0hmVHl4Q2s3RnY2MkhqMlR3Ck5RaUxCN0xzcW0vYjZia1ZYUGJR - Vk1NandDRzVZSUx1dVVTa1N0UC9iLzgKLS0tIGJOR29MSW8zQ29YMUl5OStqck0w - MGMwbVN4WDNLanJlQTBDVExkdWh1REkKJ7IItvPrcoad6TpDm0/Ctg52lqDUJjRm - w2OyUFBaDddpb5wBt/7G16gSQJOvO36r3Vg4rWHxrJUp1Yr58UpCbg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQSGlRcXFYTkhlMHFZR0w1 + UUJWVVVCS051TWRudzRYekRGanZoQm1QK0Y4CllXekNXQWdVaE9RNjZrb3YvTVJo + T1F4QUtBak9FeHU2aFI4VGRRWWRTUkUKLS0tIHI3Y0xhQ1ZWM25qelBLOUczRUFn + V0QyZUNDRGo2VkZVWHo0clBpalpraHcKPxp7J2HK3xoKZBY4jk38MY/nuEmkvZQz + u1MPnH7eKFDO2Nm2zKU2BjWjvOtfvQN+eLWV/XyFQJrLEfe0AHoi6g== -----END AGE ENCRYPTED FILE----- - recipient: age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTWHRJMFhTS0RUNVFwZ1RO - NlBXU0JFYzIrWkRVWE1RUHVtZ2NQd1ZzRlJnClZ0OFNLVmJPTDlwZVU0K1p1SVEx - aGJMYUo2MG9mZ1g1WmcwSm94blpSaU0KLS0tIGY0QVBEaWdTcFVSSytIZUJDaDY5 - SU8zTHBMMWFjZHJPa0YrNlBoOEg3R28KwUeRyXAjx6S4vHsF3iEtvYGwRJUd1gDm - olxKzPti2kHsnQJ3Sz7sKx0dFSFYIbusPUPX8OLZy2AFXM2U6JYFkA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoQU1SNUFIQ1FQS2hDS0g4 + aXl1Vzdhb21hRGFIbGREblBIdC9UVXlpKzBzCnVSRUM5VXlMOVVacWxWd0JwM28y + UHBaQmdNODkzZmFDWXJiZk9tNWIxVkkKLS0tIG94MEtCbEZwbHZmVTRPL2pNOHJr + T29IQVFQa0tsMTNCOHl2OUdyeG1GSzgKQbZnm/IlLzBkHeWF57PI7WA7eiLzlKk7 + +R9Fn1Q51NS3Ht7looDcmy6J6iU7gtyHggaadku6v6AwuxiMniSjbw== -----END AGE ENCRYPTED FILE----- - recipient: age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxbmdhZGtpb1p3Misrdjh4 - aWhDRGRNc3BHZ1BVSjJrTUZHT2ZWdzh0WWlVCis2anZqc3BWbjNBT2RyRVlpZWc5 - ZHZlWGdmenhpeHBUOFhGV0xPTnNBaWMKLS0tIHhrQytZUlV2d2ZySHFESXZabnVV - dUgrZzdxZVdZTjArMDJQS3VzMUNWZTQKN0+wEGUEXfvnIvBP3Pj+isNYogWNcJOZ - 5hZdAa/j+qSFcqTodREllOJPWNz8Rm3NDa3z/vZxfZs1jkl5mW4ESg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOOW9jMzMyVmRIS0RSZk4y + NHQwWVgxdllVVkdPcjVTTFpaMzRrZkJPOVZzClpmWkpYOW4rWXF0dk1ralhqMTdQ + Nm9wZTIvQ3hPMDVDMnY0eWtZOHEwZXcKLS0tICtoVGRIZmVlWXhXOFVaSElYNG5D + UlhZZVhFTHhsYncwbnhWdE5WUUxvL0kKksYQVCgs0f4n5f44pMjiIVi4rULhK5Fg + DLzcVFGrMKXOl44r/shlsFAlSDwlFTHWvsslPUPvTKwFvObG8sZHew== -----END AGE ENCRYPTED FILE----- - recipient: age1jrh8yyq3swjru09s75s4mspu0mphh7h6z54z946raa9wx3pcdegq0x8t4h enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnaVQ3R2VtRXFRTXBJR2da - VUpBRkJsMGl5YWFldE85UEVwR2FnSDVxSWlFCjlFOGpTNGVTYzhSMFZLUGl0cTJn - d1ZCQ04yeVdXNU1jYlBrbGNiaUQyb3cKLS0tIFZmbndDNXM3ZnZXT2JpMWFXUE5t - UWV5T2NURnpxYzFhaVNUWU5qcll4V3cKJXb7PpLodu/dYHJt7eol/B+OTmrnpqDL - RMJTfmAWHuJk7VHoTinJV2MmYyU6KU6sq2rYxKv1+uc2S/UTQCR3Rw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNZklWcFdRYW1sTzg3V0o0 + YzJSaGxQNWl3endWbXNJUlhGSWM4R0JLeDJ3CjgxeGhjV3RMNlFDb1pJYVRsK0xB + eXBwS1VMWEFtR3BkaEhET3NkMURmbFUKLS0tIFRPRlF6VkVxanRhOHNucElVWXZD + S0FGbCtUTiszUmFSNXpEamlPbUJ2NGcKe/F5skYhmZJb+0vlsolb325DVkoEj1W+ + POMMrqGwQcszsKYvxTcM5Sq7YWy7LpyP0ymEWgcvfQHrUNx2oVBZyA== -----END AGE ENCRYPTED FILE----- - recipient: age1m7xhem3qll35d539f364pm6txexvnp6k0tk34d8jxu4ry3pptv7smm0k5n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiazdENTdRcDVzRmVhVHdn - Q1E2NGxIVnBuN2RCZmVwSnhnamVmMjhTOFJrCkFrVGdobEYvSGVIN2Y3NDVEd0tE - b0lCYTQ1TEhYMlJML212ZmxiR1hieFkKLS0tICt3RVBLRVd1UWpzQm1ib1BZRUd3 - OCtmdlhZRU1ZdkRJZVdKMm1mQjFwdFEKrErnw+YwpfG8ywSSaufWbq71Q3Kc+lz3 - Tmvpi4UcEUGJTj8ZHrixvxgvUvjCcgsYKcrbbPeKynFERk6HFDZPVg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBva0I5MjFqTUg1YVNqcXY0 + dVloNFpXcGVYZmZOdEVTbm1xVEJWVHVqZ0V3ClpXeTRXczNWbDNpSXpaWExTZWRL + K2xmeERuMjRNS2JpSkJoUWlPK1phUzgKLS0tIHI3UkVMbGdNUjNhMEQ4eEQzQTda + NXdhb1l0Q0piTUJxOEVrQlBCaUVXZ1kKT5F2kxG7HukY2KTrdgHAsLgSsGS7P184 + EIPyGGrrs00kfrT0PiUl+1hVSl3uM6lAootLzdXqnFRjejt5KTl9wg== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-12-19T00:27:32Z" mac: ENC[AES256_GCM,data:hKJQ1ef7CyPOD8xd/PCqOpGSBYpSpdW37P9nOXeKQEHE58vCaiQyy5RziUIGKUI7KIcxHwa1agn/yBdaWigSWihImH2WlRMQnQJAQoSV2Tc8sDhDFFckJEDqh0Pm0g+HcjL/59J4G4QJuRgVdxNBeRT472gQN/u/Lw1CE2s6ONQ=,iv:IU2cLIfCT6DuViUTFH8EnvaWA4ok96CzXs86DRsonqM=,tag:T/+HmZLWvYNkR3u2jSWM9Q==,type:str] diff --git a/modules/shared/known-hosts.nix b/modules/shared/known-hosts.nix index 3c92abb5c..83b46d84d 100644 --- a/modules/shared/known-hosts.nix +++ b/modules/shared/known-hosts.nix @@ -18,7 +18,7 @@ }; darwin01 = { hostNames = [ "darwin01.nix-community.org" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZw+Zk6dKiiXVx2Zlo67b6uQ3o+BhPn9UU9BC6SIgZ4"; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKMHhlcn7fUpUuiOFeIhDqBzBNFsbNqq+NpzuGX3e6zv"; }; darwin02 = { hostNames = [ "darwin02.nix-community.org" ]; diff --git a/sops.json b/sops.json index c27512d5f..b5acb9b52 100644 --- a/sops.json +++ b/sops.json @@ -11,7 +11,7 @@ "build02": "age1kh6yvgxz9ys74as7aufdy8je7gmqjtguhnjuxvj79qdjswk2r3xqxf2n6d", "build03": "age1qg7tfjwzp6dxwkw9vej6knkhdvqre3fu7ryzsdk5ggvtdx854ycqevlwnq", "build04": "age1r464z5e2shvnh9ekzapgghevr9wy7spd4d7pt5a89ucdk6kr6yhqzv5gkj", - "darwin01": "age1tc0yavxcq9hnf8rl5akv4twzaqkz5p9g80r2kf8cdv4urxgm4qnszccsy3", + "darwin01": "age15dljvnazm0njdt7fh7drlsqnqx35766aex8zsv634zzpecu9cdgssmqv9a", "darwin02": "age1xpzexnaulzdjtnwstvgvtq2ar7nkk2lj46u96ewjvtgt7g47jsxs0mhag3", "web02": "age158v8dpppnw3yt2kqgqekwamaxpst5alfrnvvt7z36wfdk4veydrsqxc2tl" }