server: Support explicit specification of addresses to listen on

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/TODO b/TODO
index 07ea54f76dc996cdb1042df9fe191f04e5dc8b44..9419f15b6e18ae16e3a618b8d00faacb97a86fc2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 TODOs in diff
 content-type for download bundles
 http2 HEAD requests
-fix listen
 Build on stable

diff --git a/src/config.rs b/src/config.rs
index d3cd1182032a87ca0e08ba1bec11816040c296cc..b580c3b92ebf526508392f9d5965c81a9193a77f 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -30,6 +30,7 @@ pub struct ServerConfigSpec {
   pub command_socket: Option<String>,
   pub debug: Option<bool>,
   pub http_port: Option<u16>,
+  #[serde(default)] pub listen: Vec<SocketAddr>,
   pub public_url: String,
   pub sse_wildcard_url: Option<String>,
   pub template_dir: Option<String>,
@@ -130,7 +131,7 @@ impl ServerConfigSpec {
                  -> Result<WholeServerConfig,AE> {
     let ServerConfigSpec {
       change_directory, base_dir, save_dir, command_socket, debug,
-      http_port, public_url, sse_wildcard_url,
+      http_port, listen, public_url, sse_wildcard_url,
       template_dir, specs_dir, nwtemplate_dir, wasm_dir, libexec_dir, usvg_bin,
       log, bundled_sources, shapelibs, sendmail,
       debug_js_inject_file, check_bundled_sources, fake_rng,
@@ -281,14 +282,22 @@ impl ServerConfigSpec {
 
     let check_bundled_sources = check_bundled_sources.unwrap_or(true); 
 
-    let http_port = http_port.unwrap_or(8000);
-    let addrs: &[&dyn IpAddress] = &[
-      &Ipv6Addr::LOCALHOST,
-      &Ipv4Addr::LOCALHOST,
-    ];
-    let listen = addrs.iter()
-      .map(|addr| addr.with_port(http_port))
-      .collect();
+    let listen = (! listen.is_empty()).then(|| listen);
+    let listen = match (listen, http_port) {
+      (Some(addrs), None) => addrs,
+      (Some(_), Some(_)) => throw!(anyhow!(
+        "both http_port and listen specified")),
+      (None, http_port) => {
+        let http_port = http_port.unwrap_or(8000);
+        let addrs: &[&dyn IpAddress] = &[
+          &Ipv6Addr::LOCALHOST,
+          &Ipv4Addr::LOCALHOST,
+        ];
+        addrs.iter()
+          .map(|addr| addr.with_port(http_port))
+          .collect()
+      },
+    };
 
     let server = ServerConfig {
       save_dir, command_socket, debug,