From a59d9f61e2757c34ae37a388aa72be8c7d0ce1f1 Mon Sep 17 00:00:00 2001 From: Henri Bourcereau Date: Tue, 28 Jul 2026 13:21:39 +0200 Subject: [PATCH] fix: relay_server port configuration --- module.nix | 1 + server/relay-server/src/main.rs | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/module.nix b/module.nix index 28bec85..2f38d5b 100644 --- a/module.nix +++ b/module.nix @@ -202,6 +202,7 @@ in DATABASE_URL = "postgresql://${cfg.user}@127.0.0.1/${cfg.user}"; APP_URL = "${cfg.protocol}://${cfg.hostname}"; PAGES_DIR = cfg.pages_dir; + RELAY_PORT = toString cfg.apiPort; SMTP_HOST = cfg.smtp.host; SMTP_PORT = toString (if cfg.smtp.port != null then cfg.smtp.port else if cfg.smtp.tls then 465 else 1025); diff --git a/server/relay-server/src/main.rs b/server/relay-server/src/main.rs index 367ef98..c60e0a9 100644 --- a/server/relay-server/src/main.rs +++ b/server/relay-server/src/main.rs @@ -35,7 +35,7 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] /// Activates error tracing, spawns a watch dog task to eliminate eventual dead rooms, then it sets up the roting system to serve the -/// web sockets and listen for the pages enlist and reload. The server listens on port 8080. +/// web sockets and listen for the pages enlist and reload. async fn main() { tracing_subscriber::registry() .with( @@ -104,7 +104,11 @@ async fn main() { .layer(auth_layer) .layer(cors); - let listener = tokio::net::TcpListener::bind("127.0.0.1:8080") + let port: u16 = std::env::var("RELAY_PORT") + .ok() + .and_then(|p| p.parse().ok()) + .unwrap_or(8080); + let listener = tokio::net::TcpListener::bind(("127.0.0.1", port)) .await .unwrap();