Deuxfleurs/garage
37
58
Fork 76
Code Issues 103 Pull requests 17 Releases 30 Wiki Activity

WIP: Windows support #925

Draft
mediocregopher wants to merge 8 commits from mediocregopher/garage:windows-v1 into main
pull from: mediocregopher/garage:windows-v1
merge into: Deuxfleurs:main
Conversation 0 Commits 8 Files changed 8 +4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3e65289b85 - Show all commits

4
src/garage/secrets.rs
View file

@ -52,10 +52,14 @@ pub struct Secrets {
/// from config or CLI param or env variable or read from a file specified in config or CLI /// from config or CLI param or env variable or read from a file specified in config or CLI
/// param or env variable) /// param or env variable)
pub fn fill_secrets(mut config: Config, secrets: Secrets) -> Result<Config, Error> { pub fn fill_secrets(mut config: Config, secrets: Secrets) -> Result<Config, Error> {
#[cfg(unix)]
let allow_world_readable = secrets let allow_world_readable = secrets
.allow_world_readable_secrets .allow_world_readable_secrets
.unwrap_or(config.allow_world_readable_secrets); .unwrap_or(config.allow_world_readable_secrets);
#[cfg(not(unix))]
let allow_world_readable = config.allow_world_readable_secrets;
fill_secret( fill_secret(
&mut config.rpc_secret, &mut config.rpc_secret,
&config.rpc_secret_file, &config.rpc_secret_file,