diff --git a/.gitignore b/.gitignore index 3699f3fc..4bbb168a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Rocket.toml Revolt.*.toml +compose.override.yml target .data diff --git a/README.md b/README.md index ea8cab84..c480340f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ As a heads-up, the development environment uses the following ports: | MinIO | 14009 | | Maildev | 14025
14080 | | Revolt Web App | 14701 | -| RabbitMQ | 5672
15672 | +| RabbitMQ | 5672
15672 | | `crates/delta` | 14702 | | `crates/bonfire` | 14703 | | `crates/services/autumn` | 14704 | @@ -91,6 +91,38 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec > proxy = "https://abc@your.sentry/1" > ``` +> [!TIP] +> If you have port conflicts on common services, you can try the following: +> +> ```yaml +> # compose.override.yml +> services: +> redis: +> ports: !override +> - "14079:6379" +> +> database: +> ports: !override +> - "14017:27017" +> +> rabbit: +> ports: !override +> - "14072:5672" +> - "14672:15672" +> ``` +> +> And corresponding Revolt configuration: +> +> ```toml +> # Revolt.overrides.toml +> [database] +> mongodb = "mongodb://127.0.0.1:14017" +> redis = "redis://127.0.0.1:14079/" +> +> [rabbit] +> port = 14072 +> ``` + Then continue: ```bash diff --git a/Revolt.toml b/Revolt.toml index e5058c51..5fc7f451 100644 --- a/Revolt.toml +++ b/Revolt.toml @@ -4,10 +4,13 @@ [database] # MongoDB connection URL # Defaults to the container name specified in self-hosted -mongodb = "mongodb://127.0.0.1:14017" +mongodb = "mongodb://127.0.0.1:27017" # Redis connection URL # Defaults to the container name specified in self-hosted -redis = "redis://127.0.0.1:14079/" +redis = "redis://127.0.0.1:6379/" + +[rabbit] +host = "127.0.0.1" [hosts] # Web locations of various services diff --git a/default.nix b/default.nix index 16096d50..f8736308 100644 --- a/default.nix +++ b/default.nix @@ -1,26 +1,10 @@ -let - # Pinned nixpkgs, deterministic. Last updated: 28-07-2024. - pkgs = import (fetchTarball("https://github.com/NixOS/nixpkgs/archive/9b34ca580417e1ebc56c4df57d8b387dad686665.tar.gz")) {}; - - # Rolling updates, not deterministic. - # pkgs = import (fetchTarball("channel:nixpkgs-unstable")) {}; -in pkgs.mkShell { - name = "revoltEnv"; - - # LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ - # pkgs.gcc-unwrapped - # pkgs.zlib - # pkgs.glib - # pkgs.libGL - # ]; +{ pkgs ? import {} }: +pkgs.mkShell rec { buildInputs = [ # Tools pkgs.git - # Database - # pkgs.mongodb - # Cargo pkgs.cargo pkgs.cargo-nextest