Fix usage of RESTIC_REPOSITORY_FILE #51
This commit is contained in:
parent
84d606fa80
commit
5582744073
10
backupbot.py
10
backupbot.py
|
@ -42,7 +42,7 @@ sys.excepthook = handle_exception
|
||||||
@click.option('-l', '--log', 'loglevel')
|
@click.option('-l', '--log', 'loglevel')
|
||||||
@click.option('-m', '--machine-logs', 'machine_logs', is_flag=True)
|
@click.option('-m', '--machine-logs', 'machine_logs', is_flag=True)
|
||||||
@click.option('service', '--host', '-h', envvar='SERVICE')
|
@click.option('service', '--host', '-h', envvar='SERVICE')
|
||||||
@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY', required=True)
|
@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY')
|
||||||
def cli(loglevel, service, repository, machine_logs):
|
def cli(loglevel, service, repository, machine_logs):
|
||||||
global SERVICE
|
global SERVICE
|
||||||
if service:
|
if service:
|
||||||
|
@ -66,9 +66,13 @@ def cli(loglevel, service, repository, machine_logs):
|
||||||
|
|
||||||
|
|
||||||
def init_repo():
|
def init_repo():
|
||||||
repo = os.environ['RESTIC_REPOSITORY']
|
if repo:= os.environ['RESTIC_REPOSITORY_FILE']:
|
||||||
|
# RESTIC_REPOSITORY_FILE and RESTIC_REPOSITORY are mutually exclusive
|
||||||
|
del os.environ['RESTIC_REPOSITORY']
|
||||||
|
else:
|
||||||
|
repo = os.environ['RESTIC_REPOSITORY']
|
||||||
|
restic.repository = repo
|
||||||
logger.debug(f"set restic repository location: {repo}")
|
logger.debug(f"set restic repository location: {repo}")
|
||||||
restic.repository = repo
|
|
||||||
restic.password_file = '/var/run/secrets/restic_password'
|
restic.password_file = '/var/run/secrets/restic_password'
|
||||||
try:
|
try:
|
||||||
restic.cat.config()
|
restic.cat.config()
|
||||||
|
|
Loading…
Reference in New Issue