server: move config to cmdline args

server/Cargo.toml

@@ -22,6 +22,7 @@ axum-macros = "0.5.0"
 build-info = "0.0.40"
 cacher = { version = "0.2.0", registry = "xinu" }
 chrono = "0.4.39"
+clap = { version = "4.5.36", features = ["derive"] }
 css-inline = "0.14.0"
 futures = "0.3.31"
 headers = "0.4.0"

server/src/bin/letterbox-server.rs

@@ -15,11 +15,11 @@ use axum::{
     Router,
 };
 use cacher::FilesystemCacher;
+use clap::Parser;
 use letterbox_notmuch::Notmuch;
 #[cfg(feature = "tantivy")]
 use letterbox_server::tantivy::TantivyConnection;
 use letterbox_server::{
-    config::Config,
     graphql::{compute_catchup_ids, Attachment, MutationRoot, QueryRoot, SubscriptionRoot},
     nm::{attachment_bytes, cid_attachment_bytes},
     ws::ConnectionTracker,
@@ -201,29 +201,33 @@ struct AppState {
     connection_tracker: Arc<Mutex<ConnectionTracker>>,
 }
 
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+struct Cli {
+    #[arg(short, long, default_value = "0.0.0.0:9345")]
+    addr: SocketAddr,
+    newsreader_database_url: String,
+    newsreader_tantivy_db_path: String,
+    slurp_cache_path: String,
+}
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
+    let cli = Cli::parse();
     let _guard = xtracing::init(env!("CARGO_BIN_NAME"))?;
     build_info::build_info!(fn bi);
     info!("Build Info: {}", letterbox_shared::build_version(bi));
-    // TODO: move these to config
-    let port = 9345;
-    let config = Config {
-        newsreader_database_url: "postgres://newsreader@nixos-07.h.xinu.tv/newsreader".to_string(),
-        newsreader_tantivy_db_path: "../target/database/newsreader".to_string(),
-        slurp_cache_path: "/tmp/letterbox/slurp".to_string(),
-    };
-    if !std::fs::exists(&config.slurp_cache_path)? {
-        info!("Creating slurp cache @ '{}'", &config.slurp_cache_path);
-        std::fs::create_dir_all(&config.slurp_cache_path)?;
+    if !std::fs::exists(&cli.slurp_cache_path)? {
+        info!("Creating slurp cache @ '{}'", &cli.slurp_cache_path);
+        std::fs::create_dir_all(&cli.slurp_cache_path)?;
     }
-    let pool = PgPool::connect(&config.newsreader_database_url).await?;
+    let pool = PgPool::connect(&cli.newsreader_database_url).await?;
     let nm = Notmuch::default();
     sqlx::migrate!("./migrations").run(&pool).await?;
     #[cfg(feature = "tantivy")]
-    let tantivy_conn = TantivyConnection::new(&config.newsreader_tantivy_db_path)?;
+    let tantivy_conn = TantivyConnection::new(&cli.newsreader_tantivy_db_path)?;
 
-    let cacher = FilesystemCacher::new(&config.slurp_cache_path)?;
+    let cacher = FilesystemCacher::new(&cli.slurp_cache_path)?;
     let schema = Schema::build(QueryRoot, MutationRoot, SubscriptionRoot)
         .data(nm.clone())
         .data(cacher)
@@ -262,9 +266,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 .make_span_with(DefaultMakeSpan::default().include_headers(true)),
         );
 
-    let listener = TcpListener::bind(SocketAddr::from(([0, 0, 0, 0], port)))
-        .await
-        .unwrap();
+    let listener = TcpListener::bind(cli.addr).await.unwrap();
     tracing::info!("listening on {}", listener.local_addr().unwrap());
     axum::serve(
         listener,