diff options
| author | Ellie Huxtable <e@elm.sh> | 2021-04-21 18:13:51 +0100 |
|---|---|---|
| committer | Ellie Huxtable <e@elm.sh> | 2021-04-21 21:26:44 +0100 |
| commit | 4a50ce366639ca9dac7324d6a47d6a0e6c7fccdf (patch) | |
| tree | 7ffd8848f675e1377f750cc0757768d074a5ac05 /atuin-server | |
| parent | a9b117aad7e6bd09c7ea188258924dc02855db05 (diff) | |
Bugfixes, show time ago, perf improvements
Also allow unique listing and more ergonomic cwd usage
Diffstat (limited to 'atuin-server')
| -rw-r--r-- | atuin-server/Cargo.toml | 3 | ||||
| -rw-r--r-- | atuin-server/src/settings.rs | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml index 548a97ca..d4db38cd 100644 --- a/atuin-server/Cargo.toml +++ b/atuin-server/Cargo.toml @@ -25,7 +25,6 @@ serde_json = "1.0.64" rmp-serde = "0.15.4" unicode-width = "0.1" sodiumoxide = "0.2.6" -reqwest = { version = "0.11", features = ["blocking", "json"] } base64 = "0.13.0" fork = "0.1.18" parse_duration = "2.1.1" @@ -33,6 +32,6 @@ rand = "0.8.3" rust-crypto = "^0.2" tokio = { version = "1", features = ["full"] } warp = "0.3" -sqlx = { version = "0.5", features = [ "runtime-tokio-native-tls", "uuid", "chrono", "postgres" ] } +sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "uuid", "chrono", "postgres" ] } async-trait = "0.1.49" urlencoding = "1.1.1" diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs index 596b9018..e51b6b2a 100644 --- a/atuin-server/src/settings.rs +++ b/atuin-server/src/settings.rs @@ -23,15 +23,16 @@ impl Settings { create_dir_all(config_dir)?; - let config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG") { + let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") { PathBuf::from(p) } else { let mut config_file = PathBuf::new(); config_file.push(config_dir); - config_file.push("server.toml"); config_file }; + config_file.push("server.toml"); + // create the config file if it does not exist let mut s = Config::new(); |