LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 04:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/lemmynet/lemmy into main

Browse source
This commit is contained in:
Dessalines 2020-11-01 21:26:36 -06:00
commit eab9123b86
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/defaults.hjson
View file

@ -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

3
lemmy_utils/src/settings.rs
View file

@ -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,

2
src/main.rs
View file

@ -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()