selfhosted
/
rustypaste
mirror of https://github.com/orhun/rustypaste.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(server): allow using deprecated landing page fields 

This is a hotfix commit which allows the use of [server.landing_page]
fields even when the [landing_page] section does not exist in the
configuration file.
This commit is contained in:
Orhun Parmaksız 2023-07-01 17:28:52 +03:00
parent 4ca95cb381
commit 936feaedd5
No known key found for this signature in database
GPG Key ID: F83424824B3E4B90
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server.rs
View File

@ -1,5 +1,5 @@
use crate::auth;
use crate::config::Config;
use crate::config::{Config, LandingPageConfig};
use crate::file::Directory;
use crate::header::{self, ContentDisposition};
use crate::mime as mime_util;
@ -31,12 +31,18 @@ async fn index(config: web::Data<RwLock<Config>>) -> Result<HttpResponse, Error>
.append_header(("Location", env!("CARGO_PKG_HOMEPAGE")))
.finish();
if config.server.landing_page.is_some() {
if config.landing_page.is_none() {
config.landing_page = Some(LandingPageConfig::default());
}
if let Some(ref mut landing_page) = config.landing_page {
landing_page.text = config.server.landing_page;
}
log::warn!("[server].landing_page is deprecated, please use [landing_page].text");
}
if config.server.landing_page_content_type.is_some() {
if config.landing_page.is_none() {
config.landing_page = Some(LandingPageConfig::default());
}
if let Some(ref mut landing_page) = config.landing_page {
landing_page.content_type = config.server.landing_page_content_type;
}