start.sh

@@ -100,6 +100,9 @@ backup(){
 	echo Start backup $1 
 	echo ==================================================
 	
+	# Backupverzeichnisse einrichten
+	move_to_ROOT
+	
 	# neue Konfiguration lesen
 	#source "$CONFIG_DIR/$1"
 	
@@ -122,7 +125,7 @@ backup(){
 		then
 			b_files "${REMOTE_USER}@${REMOTE_HOST}::${MYSQL_DUMP_DIR}" "$BACKUP_DIR_CONTAINERS/${MYSQL_CONTAINER}"
 		else
-			b_files "${REMOTE_USER}@${REMOTE_HOST}::${MYSQL_DUMP_DIR}" "$BACKUP_DIR/${REMOTE_HOST}${MYSQL_DUMP_DIR}"
+			b_files "${REMOTE_USER}@${REMOTE_HOST}::${MYSQL_DUMP_DIR}" "${BACKUP_DIR_FILES}/${MYSQL_DUMP_DIR}"
 		fi
 		
 		# die SQL-Dateien vom remote host wieder löschen
@@ -134,11 +137,11 @@ backup(){
 	for dir in "${FOLDERS[@]}"
 	do
 		# die eigentliche Sicherung ...	
-		b_files "${REMOTE_USER}@${REMOTE_HOST}::${dir}" "$BACKUP_DIR/${REMOTE_HOST}${dir}"
+		b_files "${REMOTE_USER}@${REMOTE_HOST}::${dir}" "${BACKUP_DIR_FILES}/${dir}"
 		
 		# Liste der Sicherungen anzeigen
 		if [ "$2" == "--list" ]; then
-			rdiff-backup -l "$BACKUP_DIR/${REMOTE_HOST}${dir}"
+			rdiff-backup -l "${BACKUP_DIR_FILES}/${dir}"
 		fi
 		
 		echo
@@ -195,7 +198,7 @@ restore(){
 	for dir in "${FOLDERS[@]}"
 	do
 		# die eigentliche Wiederherstellung ...	
-		r_files "$BACKUP_DIR/${REMOTE_HOST}${dir}" "${REMOTE_USER}@${REMOTE_HOST}::${dir}" "$2"
+		r_files "${BACKUP_DIR_FILES}/${dir}" "${REMOTE_USER}@${REMOTE_HOST}::${dir}" "$2"
 	done
 	# SCHRITT 2:
 	# Datenbanken wiederherstellen 
@@ -236,7 +239,7 @@ list(){
 	do
 		echo show backups for file[s]: "$dir"
 		
-		rdiff-backup -l "$BACKUP_DIR/${REMOTE_HOST}${dir}"
+		rdiff-backup -l "${BACKUP_DIR_FILES}/${dir}"
 		echo
 	done