Switched to yaml-based config

Cargo.lock

@@ -296,6 +296,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
+[[package]]
+name = "dtoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+
 [[package]]
 name = "either"
 version = "1.6.1"
@@ -320,6 +326,7 @@ dependencies = [
  "atomic",
  "pear",
  "serde",
+ "serde_yaml",
  "toml",
  "uncased",
  "version_check",
@@ -641,6 +648,12 @@ version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
+
 [[package]]
 name = "lock_api"
 version = "0.4.4"
@@ -1185,6 +1198,7 @@ dependencies = [
  "chrono",
  "diesel",
  "diesel_migrations",
+ "figment",
  "hmac",
  "jwt",
  "openssl",
@@ -1270,6 +1284,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.8.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "039ba818c784248423789eec090aab9fb566c7b94d6ebbfa1814a9fd52c8afb2"
+dependencies = [
+ "dtoa",
+ "linked-hash-map",
+ "serde",
+ "yaml-rust",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -1738,6 +1764,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "yansi"
 version = "0.5.0"

Cargo.toml

@@ -34,6 +34,8 @@ sha2 = "*"
 chrono = { version = "*", features = [ "serde" ] }
 # Encoding of refresh tokens
 base64 = "0.13.0"
+# Reading in configuration files
+figment = { version = "*", features = [ "yaml" ] }
 
 [profile.release]
 lto = true

Rb.yaml

@@ -0,0 +1,19 @@
+default:
+  address: "0.0.0.0"
+  ports: 8000
+
+debug:
+  keep_alive: 5
+  read_timeout: 5
+  write_timeout: 5
+  log_level: "normal"
+  limits:
+    forms: 32768
+
+  admin_user: "admin"
+  admin_pass: "password"
+  jwt_key: "secret"
+
+  databases:
+    postgres_rb:
+      url: "postgres://rb:rb@localhost:5432/rb"

Rocket.toml

@@ -1,13 +0,0 @@
-[debug]
-port = 8000
-keep_alive = 5
-read_timeout = 5
-write_timeout = 5
-log_level = "normal"
-limits = { forms = 32768 }
-
-[debug.databases]
-postgres_rb = { url = "postgres://rb:rb@localhost:5432/rb" }
-
-[release.databases]
-postgres_rb = { url = "postgres://rb:rb@localhost:5432/rb" }

src/main.rs

@@ -10,6 +10,7 @@ extern crate diesel;
 
 use rocket::{fairing::AdHoc, Build, Rocket};
 use rocket_sync_db_pools::database;
+use figment::{Figment, providers::Env, providers::Yaml, providers::Format};
 
 mod admin;
 pub mod auth;
@@ -63,7 +64,11 @@ async fn create_admin_user(rocket: Rocket<Build>) -> Result<Rocket<Build>, Rocke
 #[launch]
 fn rocket() -> _
 {
-    rocket::build()
+    let figment = Figment::from(rocket::config::Config::default())
+        .merge(Yaml::file("Rb.yaml").nested())
+        .merge(Env::prefixed("RB_").global());
+
+    rocket::custom(figment)
         .attach(RbDbConn::fairing())
         .attach(AdHoc::try_on_ignite(
             "Run database migrations",