diff --git a/src/main.rs b/src/main.rs index 9fd1d11..86ac3a9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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(); } diff --git a/src/web.rs b/src/web.rs index ebd7ae8..0a3f55a 100644 --- a/src/web.rs +++ b/src/web.rs @@ -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 { + 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) }