Merge pull request #28 from perpetualcacophony/release/v1.8.4

hotfix to allow changing the config file location

Cargo.toml

@@ -54,6 +54,7 @@ kwordle = { git = "https://github.com/perpetualcacophony/kwordle", branch = "mas
     "classic_words",
     "step",
 ], optional = true, version = "0.5.5" }
+dotenvy = "0.15.7"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"

Dockerfile

@@ -17,4 +17,5 @@ RUN cargo +nightly build --release --target x86_64-unknown-linux-musl
 FROM alpine AS runtime
 COPY --link --from=builder /app/target/x86_64-unknown-linux-musl/release/slimebot /usr/local/bin/slimebot
 EXPOSE 443
+USER slimebot:slimebot
 ENTRYPOINT ["slimebot"]

src/framework/data.rs

@@ -4,7 +4,7 @@ use crate::commands::wordle::core::WordleData;
 use mongodb::Database;
 
 use chrono::Utc;
-use tracing::trace;
+use tracing::{info, trace, warn};
 use tracing_unwrap::ResultExt;
 
 pub(crate) type UtcDateTime = chrono::DateTime<Utc>;
@@ -27,9 +27,18 @@ pub struct PoiseData {
 
 impl PoiseData {
     pub(crate) fn new() -> Self {
+        dotenvy::dotenv().ok();
+
+        let config_file = if let Ok(path) = std::env::var("SLIMEBOT_TOML") {
+            info!(path, "looking for config file with SLIMEBOT_TOML...");
+            path
+        } else {
+            warn!("SLIMEBOT_TOML env unset, using default path /usr/share/slimebot/slimebot.toml");
+            "/usr/share/slimebot/slimebot.toml".to_owned()
+        };
+
         let config: super::config::Config = ::config::Config::builder()
-            .add_source(::config::File::with_name("slimebot.toml"))
-            .add_source(::config::Environment::with_prefix("SLIMEBOT"))
+            .add_source(::config::File::with_name(&config_file))
             .build()
             .expect_or_log("config file could not be loaded")
             .try_deserialize()