From 998bf83dae5d82cdc45102dd9c15ce7eced3e3b3 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 27 Dec 2025 03:25:13 +0100 Subject: [PATCH] Override port always based on endpoints --- nix/modules/default/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nix/modules/default/default.nix b/nix/modules/default/default.nix index 7eb5ced6b..f430dfcdd 100644 --- a/nix/modules/default/default.nix +++ b/nix/modules/default/default.nix @@ -103,11 +103,6 @@ in default = 1; description = "Number of threads to run Spacebar on when using bundle. Make sure you've enabled RabbitMQ if using more than one."; }; - PORT = lib.mkOption { - type = lib.types.nullOr lib.types.port; - default = null; - description = "Port to listen on. Used by all components, including bundle. If using bundle, all components run under the same port"; - }; }; }; }; @@ -198,6 +193,7 @@ in # things we force... CONFIG_PATH = configFile; CONFIG_READONLY = 1; + PORT = toString cfg.apiEndpoint.localPort; } // ( if cfg.cdnPath != null then @@ -226,6 +222,7 @@ in # things we force... CONFIG_PATH = configFile; CONFIG_READONLY = 1; + PORT = toString cfg.gatewayEndpoint.localPort; } // ( if cfg.cdnPath != null then @@ -254,6 +251,7 @@ in # things we force... CONFIG_PATH = configFile; CONFIG_READONLY = 1; + PORT = toString cfg.cdnEndpoint.localPort; } // ( if cfg.cdnPath != null then