borgmatic-collective/borgmatic
borgmatic-collective/borgmatic
15
60
Fork 43
Code Issues 58 Pull Requests 1 Actions Packages Releases 123 Activity

Use values from BORG_* env variables if they are not specified in config.yaml #327

Merged
witten merged 1 commits from :master into master 2020-06-21 21:30:02 +00:00
Conversation 3 Commits 1 Files Changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a12a1121b6 - Show all commits

3
borgmatic/borg/environment.py
View File

@ -19,7 +19,8 @@ DEFAULT_BOOL_OPTION_TO_ENVIRONMENT_VARIABLE = {
def initialize(storage_config): def initialize(storage_config):
for option_name, environment_variable_name in OPTION_TO_ENVIRONMENT_VARIABLE.items(): for option_name, environment_variable_name in OPTION_TO_ENVIRONMENT_VARIABLE.items():
value = storage_config.get(option_name) # Options from the config.yaml file have precedence over already set env variables:
value = storage_config.get(option_name) or os.environ.get(environment_variable_name)
if value: if value:
os.environ[environment_variable_name] = value os.environ[environment_variable_name] = value
else: else: