diff --git a/doc/book/cookbook/from-source.md b/doc/book/cookbook/from-source.md index 7105c999..d8cc01f7 100644 --- a/doc/book/cookbook/from-source.md +++ b/doc/book/cookbook/from-source.md @@ -20,10 +20,10 @@ sudo apt-get update sudo apt-get install build-essential ``` -## Building from source from the Gitea repository +## Building from source from the Forgejo repository The primary location for Garage's source code is the -[Gitea repository](https://git.deuxfleurs.fr/Deuxfleurs/garage), +[Forgejo repository](https://git.deuxfleurs.fr/Deuxfleurs/garage), which contains all of the released versions as well as the code for the developpement of the next version. @@ -85,11 +85,14 @@ The following feature flags are available in v0.8.0: | Feature flag | Enabled | Description | | ------------ | ------- | ----------- | | `bundled-libs` | *by default* | Use bundled version of sqlite3, zstd, lmdb and libsodium | -| `system-libs` | optional | Use system version of sqlite3, zstd, lmdb and libsodium
if available (exclusive with `bundled-libs`, build using
`cargo build --no-default-features --features system-libs`) | +| `consul-discovery` | optional | Enable automatic registration and discovery
of cluster nodes through the Consul API | +| `fjall` | experimental | Enable using Fjall to store Garage's metadata | +| `journald` | optional | Enable logging to systemd-journald with
`GARAGE_LOG_TO_JOURNALD=true` environment variable set | | `k2v` | optional | Enable the experimental K2V API (if used, all nodes on your
Garage cluster must have it enabled as well) | | `kubernetes-discovery` | optional | Enable automatic registration and discovery
of cluster nodes through the Kubernetes API | -| `metrics` | *by default* | Enable collection of metrics in Prometheus format on the admin API | -| `telemetry-otlp` | optional | Enable collection of execution traces using OpenTelemetry | -| `syslog` | optional | Enable logging to Syslog | | `lmdb` | *by default* | Enable using LMDB to store Garage's metadata | +| `metrics` | *by default* | Enable collection of metrics in Prometheus format on the admin API | | `sqlite` | *by default* | Enable using Sqlite3 to store Garage's metadata | +| `syslog` | optional | Enable logging to Syslog with
`GARAGE_LOG_TO_SYSLOG=true` environment variable set | +| `system-libs` | optional | Use system version of sqlite3, zstd, lmdb and libsodium
if available (exclusive with `bundled-libs`, build using
`cargo build --no-default-features --features system-libs`) | +| `telemetry-otlp` | optional | Enable collection of execution traces using OpenTelemetry | diff --git a/nix/build_index.nix b/nix/build_index.nix index 7869566f..92931eea 100644 --- a/nix/build_index.nix +++ b/nix/build_index.nix @@ -167,7 +167,7 @@ let

Sources:

diff --git a/src/garage/main.rs b/src/garage/main.rs index 72af19a9..b3574c49 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -68,24 +68,30 @@ struct Opt { async fn main() { // Initialize version and features info let features = &[ - #[cfg(feature = "k2v")] - "k2v", - #[cfg(feature = "lmdb")] - "lmdb", - #[cfg(feature = "sqlite")] - "sqlite", - #[cfg(feature = "consul-discovery")] - "consul-discovery", - #[cfg(feature = "kubernetes-discovery")] - "kubernetes-discovery", - #[cfg(feature = "metrics")] - "metrics", - #[cfg(feature = "telemetry-otlp")] - "telemetry-otlp", #[cfg(feature = "bundled-libs")] "bundled-libs", + #[cfg(feature = "consul-discovery")] + "consul-discovery", + #[cfg(feature = "fjall")] + "fjall", + #[cfg(feature = "journald")] + "journald", + #[cfg(feature = "k2v")] + "k2v", + #[cfg(feature = "kubernetes-discovery")] + "kubernetes-discovery", + #[cfg(feature = "lmdb")] + "lmdb", + #[cfg(feature = "metrics")] + "metrics", + #[cfg(feature = "sqlite")] + "sqlite", + #[cfg(feature = "syslog")] + "syslog", #[cfg(feature = "system-libs")] "system-libs", + #[cfg(feature = "telemetry-otlp")] + "telemetry-otlp", ][..]; if let Some(git_version) = option_env!("GIT_VERSION") { garage_util::version::init_version(git_version);