Deuxfleurs/garage
44
56
Fork 74
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Start to implement Website CLI

Browse source
This commit is contained in:
Quentin 2020-12-14 21:50:40 +01:00
parent d0eb6a457f
commit a3566e49da
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/garage/admin_rpc.rs
View file

@ -156,12 +156,11 @@ impl AdminRpcHandler {
))) )))
} }
BucketOperation::Website(query) => { 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 { if query.allow && query.deny {
return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket"))); return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket")));
} }
/*
if query.allow || query.deny { if query.allow || query.deny {
let exposed = query.allow; let exposed = query.allow;
if let BucketState::Present(state) = bucket.state.get_mut() { if let BucketState::Present(state) = bucket.state.get_mut() {

3
src/garage/main.rs
View file

@ -156,6 +156,9 @@ pub struct WebsiteOpt {
/// Delete /// Delete
#[structopt(long = "deny")] #[structopt(long = "deny")]
pub deny: bool, pub deny: bool,
/// Bucket name
pub bucket: String,
} }
#[derive(Serialize, Deserialize, StructOpt, Debug)] #[derive(Serialize, Deserialize, StructOpt, Debug)]