added v3

omv_backup.py

@@ -224,7 +224,7 @@ if _RESTORE:
     STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S")
     if _APP == "all":
         _DATE = "latest"
-        if host == "rpi5.home.lan":
+        if host == "rpi5.home.lan" or host == "rpi5":
             _APP = ["nginx","ha","gitea","gitlab","mailu","bitwarden","esphome","grafana","ingluxdb","kestra","matter-server","mosquitto","octoprint","octoprint2","pihole","unify_block","webhub","homepage","watchtower"]
         else:
             cmnd = "ssh root@amd.home.lan 'ls /mnt/raid/backup/m-server/docker_data/latest'"
@@ -479,6 +479,8 @@ if _BACKUP:
                 if filename.is_file():
                     logging.info(filename.path)
                     logging.info(filename.name)
+                if filename.name == "restore":
+                    break
                 host = filename.name
                 logging.info("Backup")
                 for b in backups[host]["jobs"]:
@@ -644,7 +646,7 @@ if _BACKUP:
                     user = "admin"
                     cmnd = "/share/Data/__GITLAB/omv_backup/venv/bin/python3 /share/Data/__GITLAB/omv_backup/omv_backup.py -r all"
                 else:
-                    user = "root"
+                    user = "jd"
                     cmnd = "sudo /myapps/omv_backup.py -r all"
                 msg = {"mode":_MODE, "status":"restore","bak_name":"s","host":s,"cur_job":"aaa","start_time":1,"end_time":1,"progress":0,"finished":1,"used_space":1}
                 logging.info(msg)