adjust bind from env

6 files changed, 55 insertions, 37 deletions

diff --git a/Cargo.lock b/Cargo.lock
index e039fb9..7661da8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1351,6 +1351,19 @@ dependencies = [
 ]
 
 [[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
 name = "epaint"
 version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2120,9 +2133,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "js-sys"
-version = "0.3.60"
+version = "0.3.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2138,7 +2151,7 @@ dependencies = [
  "crossbeam-channel",
  "eframe",
  "egui",
- "env_logger",
+ "env_logger 0.8.4",
  "libmpv",
  "log",
  "tokio",
@@ -2152,7 +2165,7 @@ dependencies = [
  "bytes",
  "clap",
  "client-native-lib",
- "env_logger",
+ "env_logger 0.8.4",
  "log",
  "tokio",
 ]
@@ -2161,7 +2174,7 @@ dependencies = [
 name = "keks-meet-server"
 version = "0.1.0"
 dependencies = [
- "env_logger",
+ "env_logger 0.10.0",
  "futures-util",
  "hyper",
  "listenfd",
@@ -3047,7 +3060,7 @@ dependencies = [
  "bytes",
  "clap",
  "client-native-lib",
- "env_logger",
+ "env_logger 0.8.4",
  "humansize",
  "indicatif",
  "log",
@@ -4071,9 +4084,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4081,9 +4094,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
 dependencies = [
  "bumpalo",
  "log",
@@ -4096,9 +4109,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.33"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4108,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4118,9 +4131,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4131,9 +4144,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
 
 [[package]]
 name = "wayland-client"
@@ -4220,9 +4233,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.60"
+version = "0.3.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/makefile b/makefile
index 9f91a54..7072df8 100644
--- a/makefile
+++ b/makefile
@@ -11,6 +11,9 @@ server-build:
 watch:
 	make -C client-web watch &
 	make -C server watch
+watch-public:
+	make -C client-web watch &
+	make -C server watch-public
 install:
 	cargo install --path server
 	cargo install --path client-native-gui
diff --git a/readme.md b/readme.md
index 88960e1..94a1ca0 100644
--- a/readme.md
+++ b/readme.md
@@ -36,6 +36,9 @@ make run # or `make build`
 When changing code, use `make watch` to re-build things automatically as needed.
 (run `cargo install systemfd cargo-watch` if needed)
 
+The server's bind address can be controlled using the `BIND` environment
+variable.
+
 If you use this project or have any suggestions, please
 [contact me](https://metamuffin.org/contact)
 
@@ -74,15 +77,15 @@ system works as follows:
 
 ## Keybinds
 
-| Keybind   | Action                                                  |
-| --------- | ------------------------------------------------------- |
-| `C-RET`   | Toggle chat                                             |
-| `M`       | Add microphone track                                    |
-| `R`       | Add microphone track (but with your left hand)          |
-| `C`       | Add camera track                                        |
-| `S`       | Add screencast track                                    |
-| `C-c`     | End all tracks                                          |
-| `C-v`\*   | Paste image in chat (does not require chat to be shown) |
+| Keybind | Action                                                  |
+| ------- | ------------------------------------------------------- |
+| `C-RET` | Toggle chat                                             |
+| `M`     | Add microphone track                                    |
+| `R`     | Add microphone track (but with your left hand)          |
+| `C`     | Add camera track                                        |
+| `S`     | Add screencast track                                    |
+| `C-c`   | End all tracks                                          |
+| `C-v`\* | Paste image in chat (does not require chat to be shown) |
 
 ## Debugging
 
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 60d510d..3cc9f9f 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 warp = "0.3"
 tokio = { version = "1.21", features = ["full"] }
 log = "0.4"
-env_logger = "0.8"
+env_logger = "0.10.0"
 futures-util = "0.3.24"
 listenfd = "1.0.0"
 hyper = "0.14.20"
diff --git a/server/makefile b/server/makefile
index 6299482..6097a10 100644
--- a/server/makefile
+++ b/server/makefile
@@ -5,5 +5,7 @@ run:
 	cargo +nightly run --release
 watch:
 	systemfd --no-pid -s http::8080 -- cargo watch -x '+nightly run'
+watch-public:
+	systemfd --no-pid -s http::0.0.0.0:8080 -- cargo watch -x '+nightly run'
 target/release/keks-meet: $(shell find src) Cargo.toml
 	cargo +nightly build --release
diff --git a/server/src/main.rs b/server/src/main.rs
index d958d66..229a935 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -12,6 +12,8 @@ use log::{debug, error};
 use room::Room;
 use std::collections::HashMap;
 use std::convert::Infallible;
+use std::net::SocketAddr;
+use std::str::FromStr;
 use std::sync::Arc;
 use tokio::sync::RwLock;
 use warp::hyper::Server;
@@ -69,13 +71,8 @@ async fn run() {
         Server::from_tcp(l).unwrap()
     } else {
         Server::bind(
-            &(
-                [127, 0, 0, 1],
-                std::env::var("PORT")
-                    .map(|p| p.parse().unwrap())
-                    .unwrap_or(8080),
-            )
-                .into(),
+            &SocketAddr::from_str(&std::env::var("BIND").unwrap_or(String::from("127.0.0.1:8080")))
+                .unwrap(),
         )
     };
     let service = warp::service(routes);