From 00ec57f814629f87ab27d2f3ab71f119feefbb9b Mon Sep 17 00:00:00 2001
From: boozaa <boozaa@shortrip.org>
Date: Sun, 3 Nov 2013 01:14:35 +0100
Subject: [PATCH] Add rdiff-backup optional backup worlds

Add some settings in msm.conf :
- boolean flags to enable or not zip original backup system or
rdiff-backup
- path where to store rdiff-backup world backups
- number of days to keep
- nice parameter
---
 init/msm | 44 +++++++++++++++++++++++++++++++++++---------
 msm.conf | 23 +++++++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/init/msm b/init/msm
index c5354f4..dbd9ed3 100755
--- a/init/msm
+++ b/init/msm
@@ -373,20 +373,32 @@ world_toggle_ramdisk_state() {
 # Backs up a world
 # $1: The ID of the world
 world_backup() {
-	world_property "$1" PATH
-	world_property "$1" BACKUP_PATH
-
-	echo -n "Backing up world \"${WORLD_NAME[$1]}\"... "
-	
-	file_name="$(date "+%F-%H-%M-%S").zip"
+	manager_property WORLD_ARCHIVE_ENABLED
+	manager_property RDIFF_BACKUP_ENABLED
 	local server_id="${WORLD_SERVER_ID[$1]}"
 	local containing_dir="$(dirname "${WORLD_PATH[$1]}")"
 	local dir_name="$(basename "${WORLD_PATH[$1]}")"
+	world_property "$1" PATH
+	world_property "$1" BACKUP_PATH
 
-	server_property "$server_id" USERNAME
-	as_user "${SERVER_USERNAME[$server_id]}" "mkdir -p \"${WORLD_BACKUP_PATH[$1]}\" && cd \"$containing_dir\" && zip -rq \"${WORLD_BACKUP_PATH[$1]}/${file_name}\" \"${dir_name}\""
+	echo -n "Entering in backup function ... "
 
-	echo "Done."
+
+	if [[ "$SETTINGS_WORLD_ARCHIVE_ENABLED" == "true" ]]; then
+		echo -n "Backing up world \"${WORLD_NAME[$1]}\"... "		
+		file_name="$(date "+%F-%H-%M-%S").zip"
+		server_property "$server_id" USERNAME
+		as_user "${SERVER_USERNAME[$server_id]}" "mkdir -p \"${WORLD_BACKUP_PATH[$1]}\" && cd \"$containing_dir\" && zip -rq \"${WORLD_BACKUP_PATH[$1]}/${file_name}\" \"${dir_name}\""
+		echo "Done."
+	fi
+
+	if [[ "$SETTINGS_RDIFF_BACKUP_ENABLED" == "true" ]]; then
+		echo -n "rdiff-backup world \"${WORLD_NAME[$1]}\"... "
+    server_property "$server_id" USERNAME
+    as_user "${SERVER_USERNAME[$server_id]}" "mkdir -p \"${RDIFF_BACKUP_PATH[$1]}\" && cd \"$containing_dir\" && nice -n \"$SETTINGS_RDIFF_BACKUP_NICE\" rdiff-backup \"${dir_name}\" \"${RDIFF_BACKUP_PATH[$1]}\" && nice -n \"$SETTINGS_RDIFF_BACKUP_NICE\" rdiff-backup --remove-older-than \"$SETTINGS_RDIFF_BACKUP_ROTATION\"D --force \"${RDIFF_BACKUP_PATH[$1]}\""
+		echo "Done."
+	fi
+	
 }
 
 # Activates a world
@@ -409,6 +421,10 @@ world_activate() {
 			error_exit DIR_NOT_FOUND "Directory \"${WORLD_INACTIVE_PATH[$1]}\" could not be found."
 		fi
 	fi
+
+
+
+
 }
 
 # Deactivates a world
@@ -486,7 +502,9 @@ world_property() {
 				;;
 			BACKUP_PATH)
 				manager_property WORLD_ARCHIVE_PATH
+				manager_property WORLD_RDIFF_PATH
 				WORLD_BACKUP_PATH[$1]="$SETTINGS_WORLD_ARCHIVE_PATH/${SERVER_NAME[$sid]}/${WORLD_NAME[$1]}"
+				RDIFF_BACKUP_PATH[$1]="$SETTINGS_WORLD_RDIFF_PATH/${SERVER_NAME[$sid]}/${WORLD_NAME[$1]}"
 				;;
 			RAMDISK_PATH)
 				manager_property RAMDISK_STORAGE_ENABLED
@@ -529,6 +547,7 @@ world_dirty_properties() {
 	unset WORLD_FLAG_INRAM$index
 	unset WORLD_LINK$index
 	unset WORLD_BACKUP_PATH$index
+	unset RDIFF_BACKUP_PATH$index
 	unset WORLD_RAMDISK_PATH$index
 	unset WORLD_INRAM$index
 }
@@ -3215,6 +3234,13 @@ register_settings() {
 	register_setting RAMDISK_STORAGE_ENABLED "true"
 	register_setting RAMDISK_STORAGE_PATH "/dev/shm/msm"
 
+	register_setting WORLD_ARCHIVE_ENABLED "true"
+	register_setting WORLD_RDIFF_PATH "/opt/msm/rdiff-backup/worlds"
+	register_setting RDIFF_BACKUP_ENABLED "false"
+	register_setting RDIFF_BACKUP_NICE "19"
+	register_setting RDIFF_BACKUP_ROTATION "7"
+
+
 	register_setting UPDATE_URL "https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest"
 
 	register_setting WORLD_ARCHIVE_PATH "/opt/msm/archives/worlds"
diff --git a/msm.conf b/msm.conf
index 53af4dc..eeb148d 100644
--- a/msm.conf
+++ b/msm.conf
@@ -39,6 +39,9 @@ RAMDISK_STORAGE_ENABLED="true"
 RAMDISK_STORAGE_PATH="/dev/shm/msm"
 
 
+# Backup Options
+# -------------------
+
 # Quick IMPORTANT note:
 # The following three paths are used to store backups of your servers which
 # MSM creates periodically. Backups are useful if a world becomes unplayable
@@ -50,6 +53,8 @@ RAMDISK_STORAGE_PATH="/dev/shm/msm"
 # separate disk. This can be achieved by mounting an external hard drive, or
 # a NAS and locating the following paths there.
 
+# Did zip backup enabled ?
+WORLD_ARCHIVE_ENABLED="true"
 
 # Where "WorldEdit snapshot" compatible world backups are stored.
 WORLD_ARCHIVE_PATH="/opt/msm/archives/worlds"
@@ -60,6 +65,24 @@ LOG_ARCHIVE_PATH="/opt/msm/archives/logs"
 # Where complete server backups are stored:
 BACKUP_ARCHIVE_PATH="/opt/msm/archives/backups"
 
+# rdiff-backup for worlds note:
+# If you want to use rdiff-backup as backup system for your worlds you need to have 
+# it installed on your server. 
+# You can enable it and set number of days to keep versions in RDIFF_BACKUP_ROTATION.
+# The RDIFF_BACKUP_NICE indice is the priority when the task is launched: -20 is
+# the higher priority, let to default (19) as a less priority is probably what you need.
+
+# Did rdiff-backup enabled ?
+RDIFF_BACKUP_ENABLED="false"
+
+# Number of days to keep versions
+RDIFF_BACKUP_ROTATION="7"
+
+# The nice parameter "-20" to "19", -20 is the higher priority on the system, 19 is the lessest
+RDIFF_BACKUP_NICE="19"
+
+# Where "rdiff-backup" world backups are stored.
+WORLD_RDIFF_PATH="/opt/msm/rdiff-backup/worlds"
 
 
 # Server Defaults