diff --git a/crates/caldav/src/lib.rs b/crates/caldav/src/lib.rs index 212396c..56259e9 100644 --- a/crates/caldav/src/lib.rs +++ b/crates/caldav/src/lib.rs @@ -24,10 +24,6 @@ mod subscription; pub use error::Error; -pub fn configure_well_known(cfg: &mut web::ServiceConfig, caldav_root: String) { - cfg.service(web::redirect("/caldav", caldav_root).permanent()); -} - pub fn configure_dav< AP: AuthenticationProvider, AS: AddressbookStore, diff --git a/crates/carddav/src/lib.rs b/crates/carddav/src/lib.rs index c1309e2..434225a 100644 --- a/crates/carddav/src/lib.rs +++ b/crates/carddav/src/lib.rs @@ -25,10 +25,6 @@ pub mod addressbook; pub mod error; pub mod principal; -pub fn configure_well_known(cfg: &mut web::ServiceConfig, carddav_root: String) { - cfg.service(web::redirect("/carddav", carddav_root).permanent()); -} - pub fn configure_dav( cfg: &mut web::ServiceConfig, auth_provider: Arc, diff --git a/src/app.rs b/src/app.rs index d2e6fc0..e1e5ec3 100644 --- a/src/app.rs +++ b/src/app.rs @@ -46,10 +46,8 @@ pub fn make_app( })) .service( web::scope("/.well-known") - .configure(|cfg| rustical_caldav::configure_well_known(cfg, "/caldav".to_string())) - .configure(|cfg| { - rustical_carddav::configure_well_known(cfg, "/carddav".to_string()) - }), + .service(web::redirect("/caldav", "/caldav")) + .service(web::redirect("/carddav", "/carddav")), ); if frontend_config.enabled {