Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ creation_rules:
- age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay
- age1jrh8yyq3swjru09s75s4mspu0mphh7h6z54z946raa9wx3pcdegq0x8t4h
- age1m7xhem3qll35d539f364pm6txexvnp6k0tk34d8jxu4ry3pptv7smm0k5n
path_regex: ^hosts/web02/secrets.yaml$
path_regex: ^hosts/web01/secrets.yaml$
- key_groups:
- age:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMm3/o1HguyRL1z/nZxLBY9j/YUNXeNuDoiBLZAyt88Z
Expand Down
8 changes: 4 additions & 4 deletions dnscontrol/dnsconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var hosts = {
ipv4: "49.12.162.21",
ipv6: "2a01:4f8:d1:5715::2"
},
"web02": {
"web01": {
ipv4: "46.226.105.188",
ipv6: "2001:4b98:dc0:43:f816:3eff:fec9:5764"
},
Expand All @@ -53,19 +53,19 @@ var hosts = {
var cnames = {
// keep-sorted start
"aarch64-build-box": "build05",
"alertmanager": "web02",
"alertmanager": "web01",
"build-box": "build01",
"buildbot": "build03",
"darwin-build-box": "darwin01",
"docker": "zimbatm.docker.scarf.sh.", // Used by nix-community/nixpkgs-docker
"grafana": "web02",
"grafana": "web01",
"hydra": "build03",
"landscape": "build03",
"nixpkgs-update-cache": "build02",
"nixpkgs-update-logs": "build02",
"nl.meet": "nixnl.codeberg.page.",
"nur-update": "build03",
"prometheus": "web02",
"prometheus": "web01",
"temp-cache": "build03",
// keep-sorted end
};
Expand Down
2 changes: 1 addition & 1 deletion docs/infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
--8<-- "docs/build02.json"
```

#### [`Monitoring`](./other-services.md#monitoring) - `web02`
#### [`Monitoring`](./other-services.md#monitoring) - `web01`

- Provider: Gandi
- Instance type: [V-R4](https://www.gandi.net/en-GB/cloud/vps)
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
build05.system = "aarch64-linux";
darwin01.system = "aarch64-darwin";
darwin02.system = "aarch64-darwin";
web02.system = "x86_64-linux";
web01.system = "x86_64-linux";
};

systemModules = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions modules/shared/known-hosts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
hostNames = [ "darwin02.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb/DRvrCZ65QB8OPimqthgUY9MZ+QO3QcFy6mpiUomV";
};
web02 = {
hostNames = [ "web02.nix-community.org" ];
web01 = {
hostNames = [ "web01.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAkBZMRNgsJ/IbLtjMHqBw/9+4tyn9nT+5B5RFiV0vJ";
};
};
Expand Down
6 changes: 3 additions & 3 deletions secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ssh_host_ed25519_key:
build03: ENC[AES256_GCM,data:GsCPKzEPBkc3o+6gSKXIEXudNOg4hQ2i/nVu0IoPVG99QaL77VxQczmiEINPCXYOqvH0ugD9TGW1SEOghv1VYzCus98IMcCfWJqiZAEPjqtu9uvoBR54uw4rehHrMeBD5auGzWwJcJ3PT2fHAE0G9A6khWLdYyE7O9OFo490DAJD/XMO/beEsMiLI9nTCzLgCEL4koM8Omg4crq2ixLcGnueBsP5uF+W8vuvKBwz1TgAg7qguNEYnqHVZLEQgKBMCdca2yPmKnbEBMKnlsjGOWThT9Bw3JB8slBaIV6dCvvFUNnfqhVo9NZtaLH7ciPZCD1+vk9ja7KE8PqwUGVbrQM32DFajhtFSJa+IUZYAda192ZTbVEE4T/xL7mhYsS1rnGFIsGVSHjC/QgC9VU4THbkcO/1Uzt0H8OeSaMLERxpKmVqqLlvQPAs+/bos3D9vHHlfiY6liq1fa0++2+JnuSTsKLEmh6+h1/prhQ8oy+0imm15AHDsTllbaWxMjRCBSVaua25+h2eTEci1T3/h8XiM3+S7yWa3sfoe1Kj1fNmDlQ=,iv:VRAoe3bRpEBDGDAX/dZM+TOM8I6K2oxb1d3Ld+BQKuE=,tag:CIndzn8DJdxJLuFMtpk8Ww==,type:str]
build04: ENC[AES256_GCM,data:e8qLPiTruUq1OSgfR6KQ/zXMeLeTapH8k9viglYdz0mjG198oKPc2JNgLsuL8vFBafJ9P0SHJlKH6wQNApPNgEaktfTpx11WlK5oEa9J/Bw3OuFUJnyRE3UzxvWNzj5BVIk6pQBDhc2rOucAbiWwTJu76Wxopd5PQ5GVyEK2OIYaZ2rG2ZlF9RbfZgfiq0HBkZhPfL4osUMGmFRsa6p18xH4wm+Ey08n5DG27AxGf7yjKiXswlZfzgxX3ukqsNw5pw3GNHRLjlsJsprTMVj+hgS5N3PeY+IViJKHE0VmEU3pJzlFSAk05mTrYzJ0jHlfQTbWHs6wYkc3EbKXG83zcviowGMK78P8Qpy0h9/3+r1I55/3UAd4JKnGbz+ADTMwowgNeZO/Vv0LQN3zspyfmYiQ3sD55kdGLWVnWFXZ1m0x+3D+CK7KaH7hqoT0GY2rYFwvM5fXKy7ekrGtpUyZPy8iQw6Vxl0+bcKgU6IcWYikZ32XvR4bjY9uDBvuS+Kk1e7y9WTy2h0p5fw7T2aWE/rw9m5TuUnn13gRHo1KRfNApzQckc5NbXG+VhMrQ9y1,iv:to8K9ljpumnRFz7lmxi0C6JT6xME3Sukh2jWRYkZlPg=,tag:puIarMsuxMidHOJ18ZO2mQ==,type:str]
build05: ENC[AES256_GCM,data:VdABmf9bdGvRjgoSql7FWBMPOlU1ekWhn31UrakRvM+ApQa1QDY5YQYYlPgJL7qGsamZ2rSKO19jLYRULU9rqMC+qUctJ9JsBjhQonRLZLDH9k16bvezsf6FJ56e/X8iR+fpGJ2y2heiOfh+kNsPD5N6S5bHZDOqVgf1LH0NQ4XXeRwZjBZUoXwrwpfbLLMrOtcmsW0IdpR3OAJVRg5UMUa6mQgTfe3jne9Adb1PFb9VG4bxz4A6bnbdZb+olKaEp3Fz+g/pg7XS4QovGXb/f2DRpZ9cLYdnCKGdC5xaXsH3qP/kDubIjA2Ymp6vvgo/oQdwR5xGDWnzbw4oAI3jsDIHb7V4EWKdY5RcVyxTMhSu5ZJy3KQv42NRIeeugEb4CHdY45z2cjdvaaxgIQSdRW8jayVtpEnWX8uj2ml2eC3aIA+Dc6+UH4BxkdLrbgnc3kSWx9S/yVaPYBUWWXJSUUGo6w7KJJ01VRdzh0dKEvq38lIogV+Lt7TgFZjf8/U3OyN5,iv:CmdE4wyS9nFOZ/SKumwC6ZUvm/uu3rrmviToBQd4b3E=,tag:dlxH/O53sxCLcJ//gDnO4A==,type:str]
web02: ENC[AES256_GCM,data:KR3sChbsD8B2OPyWgrUXsXcOZa5GgYrP819LuIQt9kmd83KIidG0AzuPbHjnpB4gLRgLzMUEGXzretmITHr8llIlFzzehLXulLsdBNT4FiyD80CjzUUxT/L1TadSWCqf8DMn581t6CwdpYaOPfrAesxD4ZJE0O/6oa6/pUG6AYAgFui56PAfUb1A04O8/hYZu5M9o+OxYeX7Ep3w3Fn0815Oe2qeILdjmIgecaKmc+rscJL8CrDanX5qYdAnzBEL0U8uWhDalVtHmgvTUcITeyjDNeVR0Zb76Xfl6HJb9HOpXS6DfPugONAEGyigte3PHd8lQbGArtR3UxVl95z2gQRcDIEHiYPnR1CHs1HEmLjCGot0jOnC9mHC/NAb6EYrnmRNxgu0elR3O6PNwf89Nu3Jq87GPlVTbggMg4bW8/d+ZnsOPUDSfB6F9HMDjKqu0qJdRt9D6VV/OfH537vw+XPgw/9Evdhb4tL5qX3FVjyxDSU1v5thnzum4mGoZI0S2EReRO/MO11orpIBeNOw4bwzPl7ftD6Emb0v,iv:qcewvFVbCppM0063eAVE2qkl348X3Pocm3dd+H/9Hko=,tag:QlXb7KkWV6tztq6kAbIhlw==,type:str]
web01: ENC[AES256_GCM,data:7An5iccp4rM2fiGRbQuLZQpnYsHzfJ+PwEGCPJB8J5IzpPSku0zG3uquptVNpvMlIaSlVlJYCXdLg8jgDE+1Dyi4Q7e53m5UxJjM7DcActa0qhKBVbqadn4dtidxkAkluxUs6m7IH42WS+D59UNMT87AXlNWcbv85DWjKYw6i9CVw2aMhSrpS1cKcsTf7A1ZQu1csvu5sUrAJHA00tWuzb/CeXVwJou3cH2NzwuoPdOG+xy6XKLOEt4BWQNgrajOYQ03PpTKjwn0VcBLtAjT3bAzKlcY02+5XdB7LBqQHzpF7/GuhCBJVyjpaEMibP10V1ebQnNRqsgLYygp+xl6paAM7pN7g/IfBlOcgu1Nrgj/fy3SX5la5+FFPCv5tNmk7aLpkR2pfu/YLEVhnWzmoJIQ1oNEMjH54xTYOTGN1RDSJ5kz+W2YEFdoLY4uzmq9ZtZVZPihWtMlNPF5wEVIJLuaja7TUhAjKEGYdj9hHzmH6DffzdGJJPpDMoSLaqXKhZoXniDWsSaKLhFBCNKIFvMSsr+aE7TeIjHu,iv:HwR1wV9VUYGJFr9lO2Hr2DbmDPmQKVm6kAE13KieG5A=,tag:EsJT1lQrxFZc0d2KFn++Yg==,type:str]
darwin01:
customer: ENC[AES256_GCM,data:Ygqt1vjB9S95ME5S,iv:Rxjskp16qkiIP5+yqmQK76pGKL0Uu4qrDSOQRaQMlIU=,tag:A4aDNEWRDDnRrQr2/WwEvg==,type:str]
darwin02:
Expand Down Expand Up @@ -103,7 +103,7 @@ sops:
MkcvL1JyVFBJV0Y5RFFCMGN1OUFXdU0Kdx1wy6ZOOTg1a6VKaq52SMBvC26lMsW/
oMP+hmXc2WtoqZp+jZ9rrXz6cZW6/dO7CPqxl3aUEKg6BkXIwgyKeg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-02-08T23:15:39Z"
mac: ENC[AES256_GCM,data:CYS0YqmRT1Ef2CZ49XJtISzPyfXiUROAvvN89IeTovHnOlPH9QrEz1RdU7qHVrhwFUBlANmX+j0WcPidYaRoYrooe6nL/FJQMSmLQvBIb6mGGLDBeOqace9jia9EhmRkYV63Fb2SEl0sG51a2Og8YV0prjLRKWh4b3kfBd7xiYE=,iv:cgE/+mRE+Ys+2+QiKjXUa2F+52D0FALCAVnB6xx4dm4=,tag:gvxSteQErb8Z2ekwRu1okQ==,type:str]
lastmodified: "2026-02-14T03:45:29Z"
mac: ENC[AES256_GCM,data:TOiU9JF6IUAKPj7GVhRZnu5qygHcDUGetaOk9okEYuo8vCTMOiBOfKjFw0nzGQG12wkwBFXtdRzNxAhqxdF5GH7aLzYor1kAkWdmMFe5acjbqGOf3+9DjtbB1AdSJt6B35zWHBCPit9yO739q523lMLukizZY0EbbNfjfAcX9Ig=,iv:H3yy5dx/dMc89rTdbPM35J5KhMZEvTs2BZ6CUCB0hYc=,tag:eYqVq3tkXlEzg7iM/bipUg==,type:str]
unencrypted_suffix: _unencrypted
version: 3.11.0
2 changes: 1 addition & 1 deletion sops.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let
"modules/secrets/backup.yaml" = [
"build02"
"build03"
"web02"
"web01"
];
"modules/secrets/community-builder.yaml" = [
"build01"
Expand Down
2 changes: 1 addition & 1 deletion terraform/tf-tunnel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -eu

pushd "$(dirname "$0")" >/dev/null

ssh -f -N -L "$PGPORT":/var/run/postgresql/.s.PGSQL.5432 web02.nix-community.org
ssh -f -N -L "$PGPORT":/var/run/postgresql/.s.PGSQL.5432 web01.nix-community.org

popd