diff --git a/README.md b/README.md index e84ae0d..dab3649 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Colmena [![Matrix Channel](https://img.shields.io/badge/Matrix-%23colmena%3Anixos.org-blueviolet)](https://matrix.to/#/#colmena:nixos.org) -[![Stable Manual](https://img.shields.io/badge/Manual-Stable-informational)](https://zhaofengli.github.io/colmena/stable) -[![Unstable Manual](https://img.shields.io/badge/Manual-Unstable-orange)](https://zhaofengli.github.io/colmena/unstable) +[![Stable Manual](https://img.shields.io/badge/Manual-Stable-informational)](https://colmena.cli.rs/stable) +[![Unstable Manual](https://img.shields.io/badge/Manual-Unstable-orange)](https://colmena.cli.rs/unstable) [![Build](https://github.com/zhaofengli/colmena/workflows/Build/badge.svg)](https://github.com/zhaofengli/colmena/actions/workflows/build.yml) Colmena is a simple, stateless [NixOS](https://nixos.org) deployment tool modeled after [NixOps](https://github.com/NixOS/nixops) and [morph](https://github.com/DBCDK/morph), written in Rust. @@ -145,7 +145,7 @@ Here is a sample `hive.nix` with two nodes, with some common configurations appl } ``` -The full set of options can be found in [the manual](https://zhaofengli.github.io/colmena/unstable/reference). +The full set of options can be found in [the manual](https://colmena.cli.rs/unstable/reference). Run `colmena build` in the same directory to build the configuration, or do `colmena apply` to build and deploy it to all nodes. ## Tutorial with Flakes @@ -186,12 +186,12 @@ Here is a short example: } ``` -The full set of options can be found in [the manual](https://zhaofengli.github.io/colmena/unstable/reference). +The full set of options can be found in [the manual](https://colmena.cli.rs/unstable/reference). Run `colmena build` in the same directory to build the configuration, or do `colmena apply` to build and deploy it to all nodes. ## Manual -Read [the Colmena Manual](https://zhaofengli.github.io/colmena). +Read [the Colmena Manual](https://colmena.cli.rs). ## Environment Variables diff --git a/manual/README.md b/manual/README.md index b81891c..ade9ea0 100644 --- a/manual/README.md +++ b/manual/README.md @@ -1,6 +1,6 @@ # Manual -You can read the rendered version [here](https://zhaofengli.github.io/colmena). +You can read the rendered version [here](https://colmena.cli.rs). ## Building the Manual diff --git a/manual/src/release-notes.md b/manual/src/release-notes.md index 4454ab3..d616375 100644 --- a/manual/src/release-notes.md +++ b/manual/src/release-notes.md @@ -2,11 +2,11 @@ ## [Release 0.3.0](https://github.com/zhaofengli/colmena/releases/tag/v0.3.0) (2022/04/27) -- [Remote builds](https://zhaofengli.github.io/colmena/0.3/features/remote-builds.html) are now supported ([#33](https://github.com/zhaofengli/colmena/issues/33)). -- [Streaming evaluation](https://zhaofengli.github.io/colmena/0.3/features/parallelism.html#parallel-evaluation-experimental) powered by [nix-eval-jobs](https://github.com/nix-community/nix-eval-jobs) is now available as an experimental feature (`--evaluator streaming`). -- Colmena can now run on macOS to deploy to NixOS hosts using [remote building](https://zhaofengli.github.io/colmena/0.3/features/remote-builds.html). +- [Remote builds](https://colmena.cli.rs/0.3/features/remote-builds.html) are now supported ([#33](https://github.com/zhaofengli/colmena/issues/33)). +- [Streaming evaluation](https://colmena.cli.rs/0.3/features/parallelism.html#parallel-evaluation-experimental) powered by [nix-eval-jobs](https://github.com/nix-community/nix-eval-jobs) is now available as an experimental feature (`--evaluator streaming`). +- Colmena can now run on macOS to deploy to NixOS hosts using [remote building](https://colmena.cli.rs/0.3/features/remote-builds.html). - It's now possible to configure output colorization via the CLI and environment variables. Colmena follows the [clicolors](https://bixense.com/clicolors) standard. -- [A systemd unit](https://zhaofengli.github.io/colmena/0.3/features/keys.html#key-services) (`${name}-key.service`) is now created for each secret file deployed using `deployment.keys` ([#48](https://github.com/zhaofengli/colmena/issues/48)). +- [A systemd unit](https://colmena.cli.rs/0.3/features/keys.html#key-services) (`${name}-key.service`) is now created for each secret file deployed using `deployment.keys` ([#48](https://github.com/zhaofengli/colmena/issues/48)). - Node enumeration is now faster if you do not filter against tags with `--on @tag-name`. - The main deployment logic has been rewritten to be cleaner and easier to follow. - There are now [end-to-end tests](https://github.com/zhaofengli/colmena/tree/main/integration-tests) to ensure that the development branch is actually functional as a whole at all times. @@ -34,4 +34,4 @@ This release contains the following features: - Nix Flakes Support - Parallelism -We now have a User Manual at https://zhaofengli.github.io/colmena/0.2 containing tutorials, sample configurations as well as a complete listing of supported deployment options. +We now have a User Manual at https://colmena.cli.rs/0.2 containing tutorials, sample configurations as well as a complete listing of supported deployment options. diff --git a/manual/src/tutorial/flakes.md b/manual/src/tutorial/flakes.md index dc3130c..982be13 100644 --- a/manual/src/tutorial/flakes.md +++ b/manual/src/tutorial/flakes.md @@ -11,11 +11,11 @@ For this tutorial, use the following command to enter an ephemeral environment w nix shell nixpkgs#colmena ``` -If you are interested in trying out the bleeding-edge version of Colmena, Read [the unstable version](https://zhaofengli.github.io/colmena/unstable) of the Manual for instructions. +If you are interested in trying out the bleeding-edge version of Colmena, Read [the unstable version](https://colmena.cli.rs/unstable) of the Manual for instructions. - + To quickly try Colmena out, use the following command to enter an ephemeral environment with the latest development version of `colmena`: diff --git a/manual/src/tutorial/index.md b/manual/src/tutorial/index.md index c86f88b..123b254 100644 --- a/manual/src/tutorial/index.md +++ b/manual/src/tutorial/index.md @@ -12,7 +12,7 @@ For this tutorial, use the following command to enter an ephemeral environment w nix-shell -p colmena ``` -If you are interested in trying out the bleeding-edge version of Colmena, Read [the unstable version](https://zhaofengli.github.io/colmena/unstable) of the Manual for instructions. +If you are interested in trying out the bleeding-edge version of Colmena, Read [the unstable version](https://colmena.cli.rs/unstable) of the Manual for instructions. @@ -23,7 +23,7 @@ To install the latest development version to the user profile, use the following nix-env -if https://github.com/zhaofengli/colmena/tarball/main ``` -To install the latest stable version, read [the corresponding Manual](https://zhaofengli.github.io/colmena/stable) for instructions. +To install the latest stable version, read [the corresponding Manual](https://colmena.cli.rs/stable) for instructions. ### Unstable Binary Cache diff --git a/src/cli.rs b/src/cli.rs index 62aa228..fb87e17 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -11,7 +11,7 @@ use lazy_static::lazy_static; use crate::command; /// Base URL of the manual, without the trailing slash. -const MANUAL_URL_BASE: &str = "https://zhaofengli.github.io/colmena"; +const MANUAL_URL_BASE: &str = "https://colmena.cli.rs"; /// URL to the manual. ///