diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-05-03T23·16+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-05-05T09·02+0000 |
| commit | 47d07e7b5f946ec6b568bba8a3244f6ca58085cc (patch) | |
| tree | dc37dcb293d0c7e4f2b26e1e3402c9d3affbe9aa | |
| parent | a9902dadcf080991c587a69e066a8b77b7b1cb94 (diff) | |
refactor(atward): Configure listen address r/2566
This appeases the flokli. Change-Id: Ib6a6c1a2cc8780e7944913d9204b42505b29fdc0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3093 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
| -rw-r--r-- | ops/modules/atward.nix | 8 | ||||
| -rw-r--r-- | 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 672b85e87d..354f9ebdd3 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 08fa512728..e412def4a9 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(), || { |