gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-22 10:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

make most changes suggested during install-party

Browse Source
This commit is contained in:
Trinity Pointard
2021-05-29 21:22:15 +02:00
parent ebd21b325e
commit 289521886b
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/garage/cli.rs
+1 -1
View File
@@ -125,7 +125,7 @@ pub enum BucketOperation {
#[structopt(name = "allow")]
Allow(PermBucketOpt),
/// Allow key to read or write to bucket
/// Deny key from reading or writing to bucket
#[structopt(name = "deny")]
Deny(PermBucketOpt),
src/rpc/rpc_client.rs
+7 -3
View File
@@ -279,9 +279,13 @@ impl RpcHttpClient {
tls_config: &Option<TlsConfig>,
) -> Result<Self, Error> {
let method = if let Some(cf) = tls_config {
let ca_certs = tls_util::load_certs(&cf.ca_cert)?;
let node_certs = tls_util::load_certs(&cf.node_cert)?;
let node_key = tls_util::load_private_key(&cf.node_key)?;
let ca_certs = tls_util::load_certs(&cf.ca_cert).map_err(|e| {
Error::Message(format!("Failed to open CA certificate file: {:?}", e))
})?;
let node_certs = tls_util::load_certs(&cf.node_cert)
.map_err(|e| Error::Message(format!("Failed to open certificate file: {:?}", e)))?;
let node_key = tls_util::load_private_key(&cf.node_key)
.map_err(|e| Error::Message(format!("Failed to open private key file: {:?}", e)))?;
let mut config = rustls::ClientConfig::new();