kotovalexarian
/
fedihub-website
Archived
1
0
Fork 0
Code

Serve static files

This commit is contained in:
Alex Kotov 2020-10-15 23:59:58 +05:00
parent 785cef1d3b
commit 96c5ea134a
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -21,5 +21,5 @@ fn main() {
let config = config::Config::from_env().unwrap();
println!("Running with {:#?}", config);
println!("Public path: {:#?}", config.public_path().unwrap());
web::rocket(config).launch();
web::rocket(config).unwrap().launch();
}

12
src/web.rs
View File

@ -2,11 +2,19 @@ use crate::config;
use crate::database;
use crate::routes;
use rocket_contrib::serve::StaticFiles;
use rocket_contrib::templates::Template;
pub fn rocket(config: config::Config) -> rocket::Rocket {
rocket::custom(config.to_rocket_config().unwrap())
pub fn rocket(config: config::Config) -> Result<rocket::Rocket, ()> {
let rocket_config = config.to_rocket_config()?;
let public_path = config.public_path()?;
let result = rocket::custom(rocket_config)
.manage(database::create_db_pool(config))
.attach(Template::fairing())
.mount("/", routes::routes())
.mount("/public", StaticFiles::from(public_path));
Ok(result)
}