From 47d07e7b5f946ec6b568bba8a3244f6ca58085cc Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 4 May 2021 01:16:56 +0200 Subject: refactor(atward): Configure listen address This appeases the flokli. Change-Id: Ib6a6c1a2cc8780e7944913d9204b42505b29fdc0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3093 Tested-by: BuildkiteCI Reviewed-by: sterni --- ops/modules/atward.nix | 8 +++++++- web/atward/src/main.rs | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ops/modules/atward.nix b/ops/modules/atward.nix index 672b85e87d32..354f9ebdd3cb 100644 --- a/ops/modules/atward.nix +++ b/ops/modules/atward.nix @@ -7,6 +7,12 @@ in { options.services.depot.atward = { enable = lib.mkEnableOption description; + host = lib.mkOption { + type = lib.types.str; + default = "[::1]"; + description = "Host on which atward should listen"; + }; + port = lib.mkOption { type = lib.types.int; default = 28973; @@ -25,7 +31,7 @@ in { Restart = "always"; }; - environment.ATWARD_PORT = toString cfg.port; + environment.ATWARD_LISTEN_ADDRESS = "${cfg.host}:${toString cfg.port}"; }; }; } diff --git a/web/atward/src/main.rs b/web/atward/src/main.rs index 08fa51272819..e412def4a969 100644 --- a/web/atward/src/main.rs +++ b/web/atward/src/main.rs @@ -58,8 +58,8 @@ fn fallback() -> Response { fn main() { let queries = queries(); - let port = std::env::var("ATWARD_PORT").unwrap_or("28973".to_string()); - let address = format!("0.0.0.0:{}", port); + let address = std::env::var("ATWARD_LISTEN_ADDRESS") + .expect("ATWARD_LISTEN_ADDRESS environment variable must be set"); rouille::start_server(&address, move |request| { rouille::log(&request, std::io::stderr(), || { -- cgit 1.4.1