Parameterize docs directory (#1245)

Adds `docs_dir` setting for configurable documentation location

diff --git a/config/defaults.hjson b/config/defaults.hjson
index 0368500b534381df405cc6fd318813b694701cac..59b808f8d06d31e7d2a9aa24369de4c4eb3a7e5e 100644 (file)
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@ -35,6 +35,8 @@
   tls_enabled: true
   # json web token for authorization between server and client
   jwt_secret: "changeme"
+  # path to built documentation
+  docs_dir: "/app/documentation"
   # address where pictrs is available
   pictrs_url: "http://pictrs:8080"
   # rate limits for various user actions, by user ip

diff --git a/lemmy_utils/src/settings.rs b/lemmy_utils/src/settings.rs
index 797c6fba1116c744b10f445f66096d8bb9b80e1f..9c6eeb28b2be7e2f6b3175e62f5647683144dac2 100644 (file)
--- a/lemmy_utils/src/settings.rs
+++ b/lemmy_utils/src/settings.rs
@@ -1,6 +1,6 @@
 use config::{Config, ConfigError, Environment, File};
 use serde::Deserialize;
-use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
+use std::{env, fs, io::Error, net::IpAddr, path::PathBuf, sync::RwLock};
 
 static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson";
 static CONFIG_FILE: &str = "config/config.hjson";
@@ -13,6 +13,7 @@ pub struct Settings {
   pub bind: IpAddr,
   pub port: u16,
   pub tls_enabled: bool,
+  pub docs_dir: PathBuf,
   pub jwt_secret: String,
   pub pictrs_url: String,
   pub rate_limit: RateLimitConfig,

diff --git a/src/main.rs b/src/main.rs
index 811c920aa1ec75a10d2426ca68f5cc154c8decf0..c55c3655d586e565718ef200ab8fa8b40369f365 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -84,7 +84,7 @@ async fn main() -> Result<(), LemmyError> {
       .configure(|cfg| images::config(cfg, &rate_limiter))
       .configure(nodeinfo::config)
       .configure(webfinger::config)
-      .service(actix_files::Files::new("/docs", "/app/documentation"))
+      .service(actix_files::Files::new("/docs", Settings::get().docs_dir))
   })
   .bind((settings.bind, settings.port))?
   .run()