specify bind address in config

3 files changed, 11 insertions, 6 deletions

diff --git a/config/config.example.toml b/config/default.toml
index 780c8b5..c23fdc2 100644
--- a/config/config.example.toml
+++ b/config/default.toml
@@ -1,3 +1,6 @@
+[server]
+bind = "127.0.0.1:24319"
+
 [features]
 room_watches = true
 
diff --git a/server/src/config.rs b/server/src/config.rs
index 1351f30..f11c83f 100644
--- a/server/src/config.rs
+++ b/server/src/config.rs
@@ -4,14 +4,21 @@
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
 use serde::{Deserialize, Serialize};
+use std::net::SocketAddr;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Config {
+    pub server: ServerConfig,
     pub features: FeaturesConfig,
     pub webrtc: WebrtcConfig,
     pub appearance: AppearanceConfig,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerConfig {
+    pub bind: SocketAddr,
+}
+
 #[rustfmt::skip]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FeaturesConfig {
diff --git a/server/src/main.rs b/server/src/main.rs
index eb6e502..64fa96f 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -19,8 +19,6 @@ use listenfd::ListenFd;
 use log::{debug, error};
 use logic::State;
 use std::convert::Infallible;
-use std::net::SocketAddr;
-use std::str::FromStr;
 use std::sync::Arc;
 use tokio::sync::mpsc;
 use warp::{
@@ -124,10 +122,7 @@ async fn run() {
     let server = if let Some(l) = listenfd.take_tcp_listener(0).unwrap() {
         Server::from_tcp(l).unwrap()
     } else {
-        Server::bind(
-            &SocketAddr::from_str(&std::env::var("BIND").unwrap_or(String::from("127.0.0.1:8080")))
-                .unwrap(),
-        )
+        Server::bind(&config.server.bind)
     };
     let service = warp::service(routes);
     server