diff --git a/omv_backup_v2.py b/omv_backup_v2.py index 6738c08..b47411e 100644 --- a/omv_backup_v2.py +++ b/omv_backup_v2.py @@ -330,7 +330,7 @@ if _BACKUP: now = datetime.datetime.now() BACKUP_HOST = "root@omv.home.lan" BACKUP_DEVICE = "/srv/dev-disk-by-uuid-2f843500-95b6-43b0-bea1-9b67032989b8" - BACKUP_DIR = f"{BACKUP_HOST}/{SOURCE_DIR}" + BACKUP_DIR = f"{BACKUP_HOST}:{SOURCE_DIR}" DATETIME = now.strftime("%Y-%m-%d_%H-%M-%S") @@ -338,9 +338,8 @@ if _BACKUP: NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}/initial" else: NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}/{DATETIME}" - LATEST_LINK="{}/latest".format(BACKUP_DIR) - FULL_BACKUP_LATEST = f"{NEW_BACKUP_DIR}/latest" - LATEST_LINK = f"/{host}/{b}/latest" + + FULL_BACKUP_LATEST = f"{BACKUP_DEVICE}/backup/{host}/{b}/latest" msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} @@ -360,7 +359,7 @@ if _BACKUP: if _FIRST: cmnd = f"rsync -avz --delete {SOURCE_DIR} --exclude=\"gitlab/logs/prometheus\" --exclude=\"home-assistant.log\" --exclude=\"gitlab/logs/*\" --exclude=\"esphome/config/.esphome\" --exclude=\".cache\" --exclude=\".git\" --exclude=\"var_lib_motioneye\" rsync://{BACKUP_HOST}{BACKUP_PATH}" else: - cmnd = f"rsync -avz --delete {BACKUP_DIR} --link-dest {LATEST_LINK} --exclude=\"gitlab/logs/prometheus\" --exclude=\"home-assistant.log\" --exclude=\"gitlab/logs/*\" --exclude=\"esphome/config/.esphome\" --exclude=\".cache\" --exclude=\".git\" --exclude=\"var_lib_motioneye\" {NEW_BACKUP_DIR}" + cmnd = f"rsync -avz --delete {BACKUP_DIR} --link-dest {FULL_BACKUP_LATEST} --exclude=\"gitlab/logs/prometheus\" --exclude=\"home-assistant.log\" --exclude=\"gitlab/logs/*\" --exclude=\"esphome/config/.esphome\" --exclude=\".cache\" --exclude=\".git\" --exclude=\"var_lib_motioneye\" {NEW_BACKUP_DIR}" ans = "y" print(cmnd)