aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-01-06 12:58:21 +0100
committerAlex Auvolat <alex@adnab.me>2022-01-13 14:25:19 +0100
commit9eb211948ec54430170e981201fe33b3997e2da5 (patch)
tree1e8ba8451d94e24686786497e7dec1b3b7245a22
parent3ea8ca1b9e8d0eb09d4d47869da1aca4c8dadade (diff)
downloadgarage-9eb211948ec54430170e981201fe33b3997e2da5.tar.gz
garage-9eb211948ec54430170e981201fe33b3997e2da5.zip
Allow setting index document and error document on the CLI
-rw-r--r--src/garage/admin.rs4
-rw-r--r--src/garage/cli/structs.rs8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/garage/admin.rs b/src/garage/admin.rs
index 4a53792d..f9ec1593 100644
--- a/src/garage/admin.rs
+++ b/src/garage/admin.rs
@@ -404,8 +404,8 @@ impl AdminRpcHandler {
let website = if query.allow {
Some(WebsiteConfig {
- index_document: "index.html".into(),
- error_document: None,
+ index_document: query.index_document.clone(),
+ error_document: query.error_document.clone(),
})
} else {
None
diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs
index a544d6a1..30cbb2da 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -188,6 +188,14 @@ pub struct WebsiteOpt {
/// Bucket name
pub bucket: String,
+
+ /// Index document: the suffix appended to request paths ending by /
+ #[structopt(short = "i", long = "index-document", default_value = "index.html")]
+ pub index_document: String,
+
+ /// Error document: the optionnal document returned when an error occurs
+ #[structopt(short = "e", long = "error-document")]
+ pub error_document: Option<String>,
}
#[derive(Serialize, Deserialize, StructOpt, Debug)]