From 58ea7660272ee3f40b5a719a6beeb43ceb4c309e Mon Sep 17 00:00:00 2001 From: jblu Date: Tue, 29 Aug 2023 14:14:04 -0500 Subject: [PATCH] yet more bugs --- restic.sh | 2 +- seafile-backup.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/restic.sh b/restic.sh index c2c0d3b..6ac0ad1 100644 --- a/restic.sh +++ b/restic.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/ash : "${RESTIC_REPOSITORY:?Need the restic repository}" : "${AWS_ACCESS_KEY_ID:?Need the access key id}" : "${AWS_SECRET_ACCESS_KEY:?Need the secret access key}" diff --git a/seafile-backup.py b/seafile-backup.py index e4ef8ab..0a5128e 100644 --- a/seafile-backup.py +++ b/seafile-backup.py @@ -90,15 +90,16 @@ if db_dump: os.system(f'mariadb-dump -h {db_dump_host} -u {db_dump_user} -p{db_dump_password} --skip-opt\ {database} > {db_dump_tmp_path}{database}.{now.strftime("%m-%d-%Y_%H-%M-%S")}.sql') -# Local rclone backup -if rclone_copy: - os.system(f'rclone sync -P {seafile_data_local} {seafile_data_backup}') - +# Create the config if rclone_config_create: rclone_config_check = str(subprocess.check_output(["rclone", "config", "file"])) if "doesn't exist" in rclone_config_check: os.system(f"rclone config create {rclone_remote} {rclone_backend} provider={rclone_provider}\ endpoint={rclone_endpoint} env_auth=true") + +# Local rclone backup +if rclone_copy: + os.system(f'rclone sync -P {seafile_data_local} {seafile_data_backup}') # Remote rclone backup if rclone_push: