Merge branch 'master' into develop

server/Cargo.toml

@@ -3,6 +3,13 @@ name = "mnml"
 version = "0.1.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
+# makes sure to include openssl links in runtime path
+# [profile.release]
+# rpath = true
+
+# [profile.dev]
+# rpath = true
+
 [dependencies]
 rand = "0.6"
 uuid = { version = "0.5", features = ["serde", "v4"] }
@@ -39,4 +46,3 @@ stripe-rust = { version = "0.10.4", features = ["webhooks"] }
 [patch.crates-io]
 # stripe-rust = { git = "https://github.com/margh/stripe-rs.git" }
 
-stripe-rust = { git = "https://github.com/margh/stripe-rs.git" }

server/src/main.rs

@@ -52,7 +52,7 @@ mod ws;
 
 use std::thread::{sleep, spawn};
 use std::time::{Duration};
-use dotenv::dotenv;
+use std::path::{Path};
 
 use pubsub::pg_listen;
 use warden::warden;
@@ -78,7 +78,7 @@ fn setup_logger() -> Result<(), fern::InitError> {
 }
 
 fn main() {
-    dotenv().ok();
+    dotenv::from_path(Path::new("/etc/mnml/server.conf")).ok();
     setup_logger().unwrap();
 
     let pool = pg::create_pool();