Merge pull request #391 from yungwine/backup

Backups update

Author: igroman787

mytonctrl/mytonctrl.py

@@ -944,7 +944,7 @@ def create_backup(local, ton, args):
 		color_print("{red}Bad args. Usage:{endc} create_backup [path_to_archive] [-y]")
 		return
 	if '-y' not in args:
-		res = input(f'Node and Mytoncore services will be stopped for few seconds while backup is created, Proceed [y/n]?')
+		res = input(f'Mytoncore service will be stopped for few seconds while backup is created, Proceed [y/n]?')
 		if res.lower() != 'y':
 			print('aborted.')
 			return

mytonctrl/scripts/create_backup.sh

@@ -16,28 +16,28 @@ done
 COLOR='\033[92m'
 ENDC='\033[0m'
 
-systemctl stop validator
 systemctl stop mytoncore
 
-echo -e "${COLOR}[1/4]${ENDC} Stopped validator and mytoncore"
+echo -e "${COLOR}[1/4]${ENDC} Stopped mytoncore service"
 
 
 tmp_dir="/tmp/mytoncore/backup"
 rm -rf $tmp_dir
 mkdir $tmp_dir
+mkdir $tmp_dir/db
 
-cp /var/ton-work/db/config.json ${tmp_dir}
-cp -r /var/ton-work/db/keyring ${tmp_dir}
+cp /var/ton-work/db/config.json ${tmp_dir}/db
+cp -r /var/ton-work/db/keyring ${tmp_dir}/db
 cp -r /var/ton-work/keys ${tmp_dir}
 cp -r $mtc_dir $tmp_dir
 
-echo -e "${COLOR}[2/4]${ENDC} Copied files to ${tmp_dir}"
+python3 -c "import json;f=open('${tmp_dir}/db/config.json');json.load(f);f.close()" || exit 1  # Check if config.json is copied correctly
 
+echo -e "${COLOR}[2/4]${ENDC} Copied files to ${tmp_dir}"
 
-systemctl start validator
 systemctl start mytoncore
 
-echo -e "${COLOR}[3/4]${ENDC} Started validator and mytoncore"
+echo -e "${COLOR}[3/4]${ENDC} Started mytoncore service"
 
 tar -zcf $dest -C $tmp_dir .
 

mytonctrl/scripts/restore_backup.sh

@@ -29,9 +29,16 @@ rm -rf $tmp_dir
 mkdir $tmp_dir
 tar -xvzf $name -C $tmp_dir
 
+if [ ! -d ${tmp_dir}/db ]; then
+    echo "Old version of backup detected"
+    mkdir ${tmp_dir}/db
+    mv ${tmp_dir}/config.json ${tmp_dir}/db
+    mv ${tmp_dir}/keyring ${tmp_dir}/db
+
+fi
+
 rm -rf /var/ton-work/db/keyring
-cp -f ${tmp_dir}/config.json /var/ton-work/db/
-cp -rf ${tmp_dir}/keyring /var/ton-work/db/
+cp -rf ${tmp_dir}/db /var/ton-work
 cp -rf ${tmp_dir}/keys /var/ton-work
 cp -rfT ${tmp_dir}/mytoncore $mtc_dir