Merge remote-tracking branch 'origin/conf'HEADmain

2 files changed, 24 insertions, 9 deletions

diff --git a/src/config.rs b/src/config.rs
index 18c3bab..2e9c1eb 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,30 +4,45 @@ use serde::Deserialize;
 use crate::auth;
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(default)]
 pub struct Config {
-    pub serveraddr: String,
+    pub addr: String,
     pub pingtimeout: i64,
     pub pingthreshold: u64,
     pub auth: Auth,
 }
 
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            addr: "0.0.0.0:7229".to_string(),
+            pingtimeout: 10,
+            pingthreshold: 1,
+            auth: Default::default(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct Auth {
     pub method: auth::Methods,
     pub secret: String,
 }
 
+impl Default for Auth {
+    fn default() -> Self {
+        Self {
+            method: auth::Methods::None,
+            secret: String::new(),
+        }
+    }
+}
+
 impl Config {
     pub fn load() -> Result<Self, config::ConfigError> {
         let config = config::Config::builder()
-            .set_default("serveraddr", "0.0.0.0:7229")?
-            .set_default("pingtimeout", 10)?
-            .set_default("pingthreshold", 1)?
-            .set_default("timeoffset", 0)?
-            .set_default("auth.method", "none")?
-            .set_default("auth.secret", "")?
+            .add_source(File::with_name("/etc/webol").required(false))
             .add_source(File::with_name("config.toml").required(false))
-            .add_source(File::with_name("config.dev.toml").required(false))
             .add_source(config::Environment::with_prefix("WEBOL").separator("_"))
             .build()?;
 
diff --git a/src/main.rs b/src/main.rs
index edee184..7878669 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -120,7 +120,7 @@ async fn main() -> color_eyre::eyre::Result<()> {
         .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
         .with_state(Arc::new(shared_state));
 
-    let addr = config.serveraddr;
+    let addr = config.addr;
     info!("start server on {}", addr);
     let listener = tokio::net::TcpListener::bind(addr).await?;
     axum::serve(listener, app).await?;