aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-12-14 21:50:40 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-12-14 21:50:40 +0100
commita3566e49da406db9499a58a754af725a54d332af (patch)
treebcb0cca717b7c7c8aa390ec28cbc4392ce63716b
parentd0eb6a457f6f83c8f49d262adf6150964a1249b2 (diff)
downloadgarage-a3566e49da406db9499a58a754af725a54d332af.tar.gz
garage-a3566e49da406db9499a58a754af725a54d332af.zip
Start to implement Website CLI
-rw-r--r--src/garage/admin_rpc.rs5
-rw-r--r--src/garage/main.rs3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs
index 8bf1dec2..1e363677 100644
--- a/src/garage/admin_rpc.rs
+++ b/src/garage/admin_rpc.rs
@@ -156,12 +156,11 @@ impl AdminRpcHandler {
)))
}
BucketOperation::Website(query) => {
- /*let bucket = self.get_existing_bucket(&query.bucket).await?;
-
+ let bucket = self.get_existing_bucket(&query.bucket).await?;
if query.allow && query.deny {
return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket")));
}
-
+ /*
if query.allow || query.deny {
let exposed = query.allow;
if let BucketState::Present(state) = bucket.state.get_mut() {
diff --git a/src/garage/main.rs b/src/garage/main.rs
index d97ca3b8..7c8899a0 100644
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -156,6 +156,9 @@ pub struct WebsiteOpt {
/// Delete
#[structopt(long = "deny")]
pub deny: bool,
+
+ /// Bucket name
+ pub bucket: String,
}
#[derive(Serialize, Deserialize, StructOpt, Debug)]