diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2022-02-06 12:23:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 12:23:21 +0000 |
| commit | be047cb646418cb45bafc8444b00c9676a6c36bc (patch) | |
| tree | 1f65ab57c3f606d612e2419faa25cf041583f010 /src/main.rs | |
| parent | Merge pull request #727 from svenstaro/dependabot/cargo/rustls-pemfile-0.3.0 (diff) | |
| parent | Fix route_prefix for css and favicon (diff) | |
| download | miniserve-be047cb646418cb45bafc8444b00c9676a6c36bc.tar.gz miniserve-be047cb646418cb45bafc8444b00c9676a6c36bc.zip | |
Merge pull request #728 from aliemjay/custom_route_prefix
Custom route prefix
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/main.rs b/src/main.rs index 7f1944f..16feaf0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -165,10 +165,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { Some(_) => format!("https://{}", addr), None => format!("http://{}", addr), }) - .map(|url| match miniserve_config.random_route { - Some(ref random_route) => format!("{}/{}", url, random_route), - None => url, - }) + .map(|url| format!("{}{}", url, miniserve_config.route_prefix)) .collect::<Vec<_>>() }; @@ -189,13 +186,10 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .app_data(inside_config.clone()) .wrap_fn(errors::error_page_middleware) .wrap(middleware::Logger::default()) - .route( - &format!("/{}", inside_config.favicon_route), - web::get().to(favicon), - ) - .route(&format!("/{}", inside_config.css_route), web::get().to(css)) + .route(&inside_config.favicon_route, web::get().to(favicon)) + .route(&inside_config.css_route, web::get().to(css)) .service( - web::scope(inside_config.random_route.as_deref().unwrap_or("")) + web::scope(&inside_config.route_prefix) .wrap(middleware::Condition::new( !inside_config.auth.is_empty(), actix_web::middleware::Compat::new(HttpAuthentication::basic( |