Compare commits

..

14 commits

Author SHA1 Message Date
f01adf2d91 layout: make optional version mandatory in apply layout changes
Some checks are pending
ci/woodpecker/push/debug Pipeline is running
ci/woodpecker/pr/debug Pipeline is running
2025-03-11 09:18:50 +00:00
50c8f2350e move zone redundancy parsing/formatting to cli 2025-03-11 09:18:50 +00:00
225d765320 cli v2: simplify 2025-03-11 09:18:50 +00:00
aa104a1459 layout: better encapsulation 2025-03-11 09:18:50 +00:00
29a2d24724 admin api: small refactor + add comments to layout-related calls 2025-03-11 09:18:50 +00:00
fb92d33910 cli: move files around 2025-03-11 09:18:50 +00:00
2941211ce4 admin api: implement ClusterLayoutSkipDeadNodes and use it in CLI 2025-03-11 09:18:50 +00:00
2e386131e8 admin api: implement GetClusterLayoutHistory and use it in CLI 2025-03-11 09:18:50 +00:00
ace215149f admin api, cliv2: implement garage layout show using api functions 2025-03-11 09:18:50 +00:00
270dff63c2 admin api: implement PreviewClusterLayoutChanges 2025-03-11 09:18:50 +00:00
fb27ca80ca admin api: management of layout parameters through admin api 2025-03-11 09:18:50 +00:00
cef8d75983 admin api: avoid overwriting redirect rules in UpdateBucket
All checks were successful
ci/woodpecker/push/debug Pipeline was successful
ci/woodpecker/pr/debug Pipeline was successful
2025-03-07 16:25:55 +01:00
7ccbfda26d Merge pull request 'admin api: generate openapi spec using utoipa' (#979) from refactor-admin into next-v2
All checks were successful
ci/woodpecker/push/debug Pipeline was successful
ci/woodpecker/pr/debug Pipeline was successful
Reviewed-on: #979
2025-03-06 15:09:00 +00:00
21c83ab311 Merge pull request 'admi api: remove info about local node from GetClusterStatus and add specific GetNodeInfo endpoint' (#978) from refactor-admin into next-v2
All checks were successful
ci/woodpecker/push/debug Pipeline was successful
ci/woodpecker/pr/debug Pipeline was successful
Reviewed-on: #978
2025-03-06 09:50:22 +00:00

View file

@ -371,13 +371,17 @@ impl RequestHandler for UpdateBucketRequest {
if let Some(wa) = self.body.website_access {
if wa.enabled {
let (redirect_all, routing_rules) = match state.website_config.get() {
Some(wc) => (wc.redirect_all.clone(), wc.routing_rules.clone()),
None => (None, Vec::new()),
};
state.website_config.update(Some(WebsiteConfig {
index_document: wa.index_document.ok_or_bad_request(
"Please specify indexDocument when enabling website access.",
)?,
error_document: wa.error_document,
redirect_all: None,
routing_rules: Vec::new(),
redirect_all,
routing_rules,
}));
} else {
if wa.index_document.is_some() || wa.error_document.is_some() {