From cfbac90c9cfedc8f894ac507ae03d832170bb5a4 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Wed, 30 Mar 2022 03:26:12 -0700 Subject: feat: custom port --- .env | 1 + Cargo.toml | 5 ++++- docker-compose.yaml | 2 ++ src/main.rs | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..6156f5a --- /dev/null +++ b/.env @@ -0,0 +1 @@ +PORT=1965 diff --git a/Cargo.toml b/Cargo.toml index 115b80f..f663b83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ codegen-units = 1 [dependencies] # Gemini -windmark = { version = "0.1.3", features = ["logger"] } +windmark = { version = "0.1.4", features = ["logger"] } # Loggging log = "0.4.16" @@ -40,6 +40,9 @@ yarte = "0.15.6" # RNG rand = "0.8.5" +# Environment Variables +dotenv = "0.15.0" + [build-dependencies] # Templates yarte = "0.15.6" diff --git a/docker-compose.yaml b/docker-compose.yaml index 3da776b..8a5175e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,4 +4,6 @@ services: - "1965:1965" volumes: - "./.locus:/locus/.locus" + environment: + - "PORT=1965" image: "fuwn/locus:latest" diff --git a/src/main.rs b/src/main.rs index e88fd9b..9c0a1bc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -73,6 +73,7 @@ fn hits_from_route(route: &str) -> i32 { async fn main() -> Result<(), Box> { std::env::set_var("RUST_LOG", "windmark,locus=trace"); pretty_env_logger::init(); + dotenv::dotenv().ok(); let mut time_mount = Instant::now(); let mut router = Router::new(); @@ -80,6 +81,7 @@ async fn main() -> Result<(), Box> { router.set_private_key_file(".locus/locus_private.pem"); router.set_certificate_chain_file(".locus/locus_pair.pem"); + router.set_port(std::env::var("PORT").unwrap().parse().unwrap()); router.set_pre_route_callback(Box::new(|stream, url, _| { info!( "accepted connection from {} to {}", -- cgit v1.2.3