Merge pull request #9 from 007revad/develop

Develop
007revad · Dec 18, 2023 · fdbc987 · fdbc987
2 parents 7b9ae77 + 6d5fb00
commit fdbc987
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,18 @@ LOCAL_USER=Bob
 REMOTE_USER=Bob
 ```
 
+If you set REMOTE2_BACKUP=yes you also need to set the REMOTE2_PORT, REMOTE2_IP, REMOTE2_DIR, LOCAL2_USER and REMOTE2_USER to suit your setup.
+
+**For example:**
+
+```YAML
+REMOTE2_PORT=22
+REMOTE2_IP=192.168.0.111
+REMOTE2_DIR="/volume1/Backups/NAS_System_Backups/DiskStation"
+LOCAL2_USER=Bob
+REMOTE2_USER=Ted
+```
+
 ### Requirements
 
 If you want to schedule the script to run unattended, and have the script copy the backup to another server you need to have SSH keys setup so SCP can access the remote server without you entering the user's password.

diff --git a/synology_config_backup.sh b/synology_config_backup.sh
@@ -6,7 +6,7 @@
 # Works on DMS 7 and DSM 6
 #
 # Author: 007revad
-# Date/Version: 2023-02-12 v1.0.3
+# Date/Version: 2023-12-18 v1.1.4
 #
 # Github: https://github.com/007revad/Synology_Config_Backup
 # Script verified at https://www.shellcheck.net/
@@ -33,6 +33,21 @@ Local_User=
 Remote_User=
 
 
+# Optional 2nd Remote Backup Settings:
+
+# Set to yes to enable remote backup. Anything else = no
+Remote2_Backup=
+
+# Where to copy 2nd exported configuration file to
+Remote2_Port=22
+Remote2_IP=
+Remote2_DIR=
+
+# Local and 2nd remote users with SSH key setup
+Local2_User=
+Remote2_User=
+
+
 #--------------------------------------------------------------------------
 #                 Nothing below here should need changing
 #--------------------------------------------------------------------------
@@ -64,11 +79,16 @@ if [[ ! -d $Target_DIR ]]; then
 fi
 
 cd "${Target_DIR}" || exit 255
-/usr/syno/bin/synoconfbkp export --filepath="${Target_DIR}/${File_Name}"
+if [[ -f "${Target_DIR}/${File_Name}" ]]; then
+	echo -e "ERROR: Backup file already exists: \n${Target_DIR}/${File_Name}"
+	exit 255
+else
+    /usr/syno/bin/synoconfbkp export --filepath="${Target_DIR}/${File_Name}" >/dev/null
+fi
 
-# Check exported file exists
+# Check exported file created
 if [[ ! -f ${Target_DIR}/${File_Name} ]]; then
-	echo -e "ERROR: Backup file not created:\n${Target_DIR}/${File_Name}"
+	echo -e "ERROR: Backup file not created: \n${Target_DIR}/${File_Name}"
 	exit 255
 else
 	#echo "Synology configuration exported to $File_Name on $( hostname )"
@@ -77,40 +97,37 @@ else
 fi
 
 
-#--------------------------------------------------------------------------
-# Check if running on DSM 7 and target is is DSM 6
-
-# Get local DSM major version
-if [[ -f /etc/synoinfo.conf ]]; then Dsm_Local="$(get_key_value /etc.defaults/VERSION majorversion)"; fi
-
-# Get remote DSM major version
-ssh "${Remote_User}@${Remote_IP}" -p "$Remote_Port" "sudo Dsm_Remote=$(get_key_value /etc.defaults/VERSION majorversion)"
-
-
 #--------------------------------------------------------------------------
 # Copy backup to remote NAS
 
-# Get remote NAS hostname
-Remote_Host=$(nmblookup -A $Remote_IP | sed -n 2p | cut -d ' ' -f1)
-Remote_Host="${Remote_Host:1}"
+# Remote backup
+if [[ $Remote_Backup == "yes" ]]; then
+    # Get remote NAS hostname
+    Remote_Host=$(nmblookup -A $Remote_IP | sed -n 2p | cut -d ' ' -f1)
+    Remote_Host="${Remote_Host:1}"
+
+    if [[ $Remote_Host ]]; then
+        echo -e "\nCopying backup to ${Remote_Host}"
+    else
+        echo -e "\nCopying backup to ${Remote_IP}"
+    fi
+    # Push backup to other device (safer for other device to pull backup from read only share)
+    sudo -u "${Local_User}" scp -P "${Remote_Port}" "${Remote_DIR}/${File_Name}" "${Remote_User}@${Remote_IP}:${Remote_DIR}/"
+fi
 
-# Get local DSM major version
-Dsm_Local=$(get_key_value /etc.defaults/VERSION majorversion)
+# 2nd remote backup
+if [[ $Remote2_Backup == "yes" ]]; then
+    # Get remote NAS hostname
+    Remote2_Host=$(nmblookup -A $Remote2_IP | sed -n 2p | cut -d ' ' -f1)
+    Remote2_Host="${Remote2_Host:1}"
 
-if [[ $Remote_Backup == "yes" ]]; then
-	#echo "Copying backup to other device"
-	if [[ $Remote_Host ]]; then
-		echo -e "\nCopying backup to ${Remote_Host}"
-	else
-		echo -e "\nCopying backup to ${Remote_IP}"
-	fi
-	# Push backup to other device (safer for other device to pull backup from read only share)
-    if [[ $Dsm_Local == 7 ]]; then
-        # -O flag is required if DSM7 is the source or SCP defaults to SFTP
-        sudo -u "${Local_User}" scp -O -P "${Remote_Port}" "${Target_DIR}/${File_Name}" "${Remote_User}@${Remote_IP}:${Remote_DIR}/"
+    if [[ $Remote2_Host ]]; then
+        echo -e "\nCopying backup to ${Remote2_Host}"
     else
-        sudo -u "${Local_User}" scp -P "${Remote_Port}" "${Target_DIR}/${File_Name}" "${Remote_User}@${Remote_IP}:${Remote_DIR}/"
+        echo -e "\nCopying backup to ${Remote2_IP}"
     fi
+    # Push backup to other device (safer for other device to pull backup from read only share)
+    sudo -u "${Local2_User}" scp -P "${Remote2_Port}" "${Remote2_DIR}/${File_Name}" "${Remote2_User}@${Remote2_IP}:${Remote2_DIR}/"
 fi
 
 
@@ -120,3 +137,4 @@ fi
 echo -e "\nSynology configuration backup complete"
 
 exit
+