diff --git a/README.md b/README.md index d570db8f..96f715e8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ See the [Documentation](https://matrix-org.github.io/matrix-authentication-servi cd frontend npm ci npm run build - cd ../.. + cd .. ``` - Build the Open Policy Agent policies ```sh @@ -24,7 +24,7 @@ See the [Documentation](https://matrix-org.github.io/matrix-authentication-servi make # OR, if you don't have `opa` installed and want to build through the OPA docker image make DOCKER=1 - cd ../../.. + cd .. ``` - Generate the sample config via `cargo run -- config generate > config.yaml` - Run the database migrations via `cargo run -- database migrate` diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 11369bc6..e441cd6a 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -57,7 +57,7 @@ mas-templates = { path = "../templates" } indoc = "1.0.7" [features] -default = ["otlp", "jaeger", "zipkin", "prometheus", "webpki-roots", "policy-cache"] +default = ["jaeger", "zipkin", "prometheus", "webpki-roots", "policy-cache"] # Features used in the Docker image docker = ["otlp", "jaeger", "zipkin", "prometheus", "native-roots", "mas-config/docker"] @@ -70,7 +70,7 @@ native-roots = ["mas-http/native-roots", "mas-handlers/native-roots"] # Use the webpki root certificates webpki-roots = ["mas-http/webpki-roots", "mas-handlers/webpki-roots"] -# Enable OpenTelemetry OTLP exporter. +# Enable OpenTelemetry OTLP exporter. Requires protoc. otlp = ["dep:opentelemetry-otlp"] # Enable OpenTelemetry Jaeger exporter and propagator. jaeger = ["dep:opentelemetry-jaeger", "dep:opentelemetry-http"]