From 2140cd72054ac6e3a94cbe5931727159de20a97f Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 3 Jan 2022 15:06:19 +0100 Subject: Remove website redirects --- src/api/s3_website.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/api') diff --git a/src/api/s3_website.rs b/src/api/s3_website.rs index 1ea57577..8686b832 100644 --- a/src/api/s3_website.rs +++ b/src/api/s3_website.rs @@ -170,16 +170,16 @@ impl WebsiteConfiguration { } pub fn into_garage_website_config(self) -> Result { - if let Some(rart) = self.redirect_all_requests_to { - Ok(WebsiteConfig::RedirectAll { - hostname: rart.hostname.0, - protocol: rart - .protocol - .map(|x| x.0) - .unwrap_or_else(|| "http".to_string()), - }) + if self.redirect_all_requests_to.is_some() { + Err(Error::NotImplemented( + "S3 website redirects are not currently implemented in Garage.".into(), + )) + } else if self.routing_rules.map(|x| !x.is_empty()).unwrap_or(false) { + Err(Error::NotImplemented( + "S3 routing rules are not currently implemented in Garage.".into(), + )) } else { - Ok(WebsiteConfig::Website { + Ok(WebsiteConfig { index_document: self .index_document .map(|x| x.suffix.0) -- cgit v1.2.3