From adaf7d9961f7555d0f2bb120e05dd97d5778a2ef Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:02:59 +1000 Subject: [PATCH] format tree --- HOSTS.md | 38 +++++++++++++++++++------------------- README.md | 34 +++++++++++++++++++--------------- roles/builder/README.md | 5 +++-- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/HOSTS.md b/HOSTS.md index 8a15151..d392c6b 100644 --- a/HOSTS.md +++ b/HOSTS.md @@ -4,38 +4,38 @@ This machine is perfect for running heavy builds. -* Provider: Hetzner -* CPU: AMD Ryzen 7 1700X Eight-Core Processor -* RAM: 64GB -* Drives: 2 x 512 GB SATA SSD +- Provider: Hetzner +- CPU: AMD Ryzen 7 1700X Eight-Core Processor +- RAM: 64GB +- Drives: 2 x 512 GB SATA SSD ### `build02` This machine currently just runs r-ryantm/nixpkgs-update. -* Provider: Hetzner -* CPU: AMD Ryzen 7 3700X Eight-Core Processor -* RAM: 64GB DDR4 ECC -* Drives: 2 x 1 TB NVME in RAID 1 +- Provider: Hetzner +- CPU: AMD Ryzen 7 3700X Eight-Core Processor +- RAM: 64GB DDR4 ECC +- Drives: 2 x 1 TB NVME in RAID 1 ### `build03` This machine is a replacement for build01. -* Provider: Hetzner -* CPU: AMD Ryzen 5 3600 6-Core Processor -* RAM: 64GB DDR4 ECC -* Drives: 2 x 512 GB NVME in RAID 1 +- Provider: Hetzner +- CPU: AMD Ryzen 5 3600 6-Core Processor +- RAM: 64GB DDR4 ECC +- Drives: 2 x 512 GB NVME in RAID 1 ### `build04` This machine is meant as an aarch64 builder for our hydra instance running on build03. -* Provider: Oracle cloud -* Instance type: [Ampere A1 Compute](https://www.oracle.com/cloud/compute/arm/) -* CPU: 4 VCPUs on an Ampere Altra (arm64) -* RAM: 24GB -* Drives: 200 GB Block +- Provider: Oracle cloud +- Instance type: [Ampere A1 Compute](https://www.oracle.com/cloud/compute/arm/) +- CPU: 4 VCPUs on an Ampere Altra (arm64) +- RAM: 24GB +- Drives: 200 GB Block ## Deployment commands: @@ -53,13 +53,13 @@ $ inv deploy --hosts build02 reboot --hosts build02 1. Copy your ssh key to the recovery system so that the kexec image can re-use it. -``` console +```console yourmachine> ssh-copy-id root@build0X.nix-community.org ``` 2. Download and boot into kexec-image: -``` console +```console $ curl -L https://github.com/nix-community/nixos-images/releases/download/nixos-unstable/nixos-kexec-installer-x86_64-linux.tar.gz | tar -xzf- -C /root $ /root/kexec/run ``` diff --git a/README.md b/README.md index a096f5e..db82507 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,11 @@ See [here](roles/builder/README.md) for more information. We provide x86 and aarch64 linux CI via these systems: - `Hercules` - https://hercules-ci.com/github/nix-community + - To enable hercules builds go to `https://hercules-ci.com/github/nix-community/$REPO` and click "Build this repository". - `Hydra` - https://hydra.nix-community.org + - To enable hydra builds add a new project in this [file](terraform/hydra-projects.tf). ### `Cache` - https://nix-community.cachix.org/ @@ -36,8 +38,8 @@ DNS is managed by terraform in this [file](terraform/cloudflare_nix-community_or ### `ryantm-updater bot` -* Docs: https://ryantm.github.io/nixpkgs-update -* Logs: https://r.ryantm.com/log/ +- Docs: https://ryantm.github.io/nixpkgs-update +- Logs: https://r.ryantm.com/log/ ### `nur-update` @@ -50,19 +52,20 @@ For repo additions, service requests and general conversation about governance a For casual chat, come join us in the [nix-community](https://matrix.to/#/#nix-community:nixos.org) room. ### Pull requests from forks + As PRs from forks don't have automatic CI checks, admins can test PRs by posting a comment on the PR instead. -* `bors try` - check if the PR builds. -* `bors merge` - same as `bors try` but will also merge the PR if it builds successfully. -* https://bors.tech/documentation/ +- `bors try` - check if the PR builds. +- `bors merge` - same as `bors try` but will also merge the PR if it builds successfully. +- https://bors.tech/documentation/ ### nix-community administrators -* @Mic92 -* @adisbladis -* @ryantm -* @zimbatm -* @zowoq +- @Mic92 +- @adisbladis +- @ryantm +- @zimbatm +- @zowoq #### Role @@ -73,11 +76,12 @@ The role of the administrators is to support the members of the org, and the Nix The administrators are responsible for serving the community to the best of their ability and availability. They provide services such as: -* keep the systems updated and patched -* reply to user requests -* host new services that could help the project -* on-board new projects -* resolve conflict + +- keep the systems updated and patched +- reply to user requests +- host new services that could help the project +- on-board new projects +- resolve conflict The administrators are the only "owners" of the github organization. diff --git a/roles/builder/README.md b/roles/builder/README.md index 963def7..e6258ba 100644 --- a/roles/builder/README.md +++ b/roles/builder/README.md @@ -5,7 +5,8 @@ If you want access read the security guide lines on [aarch64-build-box](https:// ### Using your NixOS home-manager configuration on the hosts If you happen to have your NixOS & home-manager configurations intertwined but you'd like your familiar environment on our infrastructure you can evaluate `pkgs.writeShellScript "hm-activate" config.systemd.services.home-manager-<yourusername>.serviceConfig.ExecStart` from your NixOS configuration, and send this derivation to be realized remotely: (in case you aren't a Nix trusted user) -``` console + +```console # somehow get the .drv of the above expression into $path $ nix copy --to ssh://build01.nix-community.org --derivation $path $ ssh build01.nix-community.org @@ -13,4 +14,4 @@ $ nix-store -r $path $ $path ``` -*(My [implementation](https://github.com/ckiee/nixfiles/blob/aac57f56e417e31f00fd495d8a30fb399ecbc19b/deploy/hm-only.nix#L10) of [this](https://github.com/ckiee/nixfiles/blob/aac57f56e417e31f00fd495d8a30fb399ecbc19b/bin/c#L92-L95) ~ckie)* +_(My [implementation](https://github.com/ckiee/nixfiles/blob/aac57f56e417e31f00fd495d8a30fb399ecbc19b/deploy/hm-only.nix#L10) of [this](https://github.com/ckiee/nixfiles/blob/aac57f56e417e31f00fd495d8a30fb399ecbc19b/bin/c#L92-L95) ~ckie)_