diff --git a/omv_backups_v3.py b/omv_backups_v3.py index bf8ed7c..e39178d 100644 --- a/omv_backups_v3.py +++ b/omv_backups_v3.py @@ -141,97 +141,96 @@ while not is_port_open(BACKUP_HOST, port): print(f"Port {port} on {BACKUP_HOST} is open.") if _RESTORE: - for b in backups[host]: - topic = "sectorq/omv/backups/{}".format(b.lower()) - client.connect(broker,1883,60) - msg = {"status":"inactive","bak_name":b,"start_time":"inactive","end_time":"inactive","progress":0} + topic = "sectorq/omv/backups/{}".format(b.lower()) + client.connect(broker,1883,60) + msg = {"status":"inactive","bak_name":b,"start_time":"inactive","end_time":"inactive","progress":0} - client.publish(topic, json.dumps(msg)) - client.disconnect() - 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}/{b}" - NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}" - DATETIME = now.strftime("%Y-%m-%d_%H-%M-%S") - SOURCE_DIR = f"{BACKUP_DIR}/{_APP}" - if _FIRST: - BACKUP_PATH="{}/initial".format(BACKUP_DIR) - else: - BACKUP_PATH="{}/{}".format(BACKUP_DIR, DATETIME) - LATEST_LINK="{}/latest".format(BACKUP_DIR) - FULL_BACKUP_LATEST = f"{NEW_BACKUP_DIR}/latest" - LATEST_LINK = f"/{host}/{b}/latest" + client.publish(topic, json.dumps(msg)) + client.disconnect() + 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}/{b}" + NEW_BACKUP_DIR = f"{BACKUP_DEVICE}/backup/{host}/{b}" + DATETIME = now.strftime("%Y-%m-%d_%H-%M-%S") + SOURCE_DIR = f"{BACKUP_DIR}/{_APP}" + if _FIRST: + BACKUP_PATH="{}/initial".format(BACKUP_DIR) + else: + BACKUP_PATH="{}/{}".format(BACKUP_DIR, DATETIME) + LATEST_LINK="{}/latest".format(BACKUP_DIR) + FULL_BACKUP_LATEST = f"{NEW_BACKUP_DIR}/latest" + LATEST_LINK = f"/{host}/{b}/latest" - msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} - client.connect(broker,1883,60) - client.publish(topic, json.dumps(msg)) - client.disconnect() + msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} + client.connect(broker,1883,60) + client.publish(topic, json.dumps(msg)) + client.disconnect() - cmnd = "ssh root@omv.home.lan 'mkdir -p " + NEW_BACKUP_DIR + "'" + cmnd = "ssh root@omv.home.lan 'mkdir -p " + NEW_BACKUP_DIR + "'" - if _EXECUTE: - status, output = subprocess.getstatusoutput(cmnd) - print("Create backup dir") - print(cmnd) + if _EXECUTE: + status, output = subprocess.getstatusoutput(cmnd) + print("Create backup dir") + print(cmnd) - #cmnd = "rsync -av --delete {}/ --link-dest {} --exclude=\".cache\" {}".format(SOURCE_DIR, LATEST_LINK, BACKUP_PATH) - if _FIRST: - cmnd = f"rsync -avz --delete rsync://{BACKUP_HOST}{BACKUP_PATH} {SOURCE_DIR}" - else: - cmnd = f"rsync -avz --delete {SOURCE_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\" rsync://{BACKUP_HOST}{BACKUP_PATH}" + #cmnd = "rsync -av --delete {}/ --link-dest {} --exclude=\".cache\" {}".format(SOURCE_DIR, LATEST_LINK, BACKUP_PATH) + if _FIRST: + cmnd = f"rsync -avz --delete rsync://{BACKUP_HOST}{BACKUP_PATH} {SOURCE_DIR}" + else: + cmnd = f"rsync -avz --delete {SOURCE_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\" rsync://{BACKUP_HOST}{BACKUP_PATH}" - ans = "y" - print(cmnd) - print("Sync files") - if _TEST: - - - ans = input("continue?") or "n" - if ans == "y" and _EXECUTE: - - # rsync --info=progress2 -avz --delete /share/docker_data/ --link-dest /m-server/docker_data/latest --exclude="gitlab/data/" --exclude="esphome/config/.esphome" --exclude="gitlab/logs/prometheus" --exclude=".cache" --exclude=".git" --exclude="var_lib_motioneye" /m-server/m-server/docker_data/newone1 - - - # input("????") - - status, output = subprocess.getstatusoutput(cmnd) + ans = "y" + print(cmnd) + print("Sync files") + if _TEST: - cmnd = f"ssh root@omv.home.lan 'rm -rf {FULL_BACKUP_LATEST}'" - #print(cmnd) - print("Removing latest link") - # input("????") - if _EXECUTE: - status, output = subprocess.getstatusoutput(cmnd) - if _FIRST: - cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s initial latest'" - else: - cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s {DATETIME} latest'" - print("Creating new latest link") - #print(cmnd) - # input("????") - if _EXECUTE: - status, output = subprocess.getstatusoutput(cmnd) + ans = input("continue?") or "n" + if ans == "y" and _EXECUTE: + + # rsync --info=progress2 -avz --delete /share/docker_data/ --link-dest /m-server/docker_data/latest --exclude="gitlab/data/" --exclude="esphome/config/.esphome" --exclude="gitlab/logs/prometheus" --exclude=".cache" --exclude=".git" --exclude="var_lib_motioneye" /m-server/m-server/docker_data/newone1 - #Remove old - print("Removing old dirs") - # input("????") - #cmnd = "find {} -maxdepth 1 -type d -mtime +30 -exec rm -rf {{}} \;".format(BACKUP_DIR) - cmnd = f"cd {NEW_BACKUP_DIR} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;" - #print(cmnd) - # input("????") - if _EXECUTE: - status, output = subprocess.getstatusoutput(cmnd) - now = datetime.datetime.now() - ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S") - msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0} - client.connect(broker,1883,10) - client.publish(topic, json.dumps(msg)) - client.disconnect() +# input("????") + + status, output = subprocess.getstatusoutput(cmnd) + + cmnd = f"ssh root@omv.home.lan 'rm -rf {FULL_BACKUP_LATEST}'" + + #print(cmnd) + print("Removing latest link") +# input("????") + if _EXECUTE: + status, output = subprocess.getstatusoutput(cmnd) + if _FIRST: + cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s initial latest'" + else: + cmnd = f"ssh root@omv.home.lan 'cd {NEW_BACKUP_DIR}; ln -s {DATETIME} latest'" + print("Creating new latest link") + #print(cmnd) +# input("????") + if _EXECUTE: + status, output = subprocess.getstatusoutput(cmnd) + + + #Remove old + print("Removing old dirs") +# input("????") + #cmnd = "find {} -maxdepth 1 -type d -mtime +30 -exec rm -rf {{}} \;".format(BACKUP_DIR) + cmnd = f"cd {NEW_BACKUP_DIR} find ./ -maxdepth 1 -type d -mmin +30 -exec rm -rf {{}} \\;" + #print(cmnd) +# input("????") + if _EXECUTE: + status, output = subprocess.getstatusoutput(cmnd) + now = datetime.datetime.now() + ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S") + msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0} + client.connect(broker,1883,10) + client.publish(topic, json.dumps(msg)) + client.disconnect() print("Getting size of FS") #cmnd = "du -h --max-depth=0 {}".format(BACKUP_FS)