umstrukturierung des Beckup-Ordner

* bischerige sicherungen werden ins ROOT verschoben
* Ordner VOL und CONT werden zusätzlich angelegt

start.sh

@@ -16,6 +16,7 @@ read_config(){
 		exit 1
 	fi 
 	
+	source "$CONFIG_DIR/$1"
 }
 
 gen_config(){
@@ -32,6 +33,22 @@ gen_config(){
 	[ ! -f "$CONFIG_DIR/example_conf.sh" ] && cp /example_conf.sh "$CONFIG_DIR/example_conf.sh"
 }
 
+move_to_ROOT(){
+	read_config $1
+	# prüfen ob Ordner ROOT, VOL, CONT existieren
+	# wenn nicht ROOT anlegen und alle bisher vorhandene Ordner dorthin verschieben
+	[ ! -d "$BACKUP_DIR/${REMOTE_HOST}/ROOT" ] && mkdir -p "$BACKUP_DIR/${REMOTE_HOST}/ROOT"
+	
+	
+	### find /home/vitali/find_tests/ -maxdepth 1 -mindepth 1 -type d -name "CONT" -prune -or -name "VOL" -prune -or -name ROOT -prune -or -name "*" -exec mv -t /home/vitali/find_tests/ROOT/ {} +
+	
+	find "$BACKUP_DIR/${REMOTE_HOST}" -maxdepth 1 -mindepth 1 -type d -name "CONT" -prune -or -name "VOL" -prune -or -name "ROOT" -prune -or -name "*" -exec mv -t "$BACKUP_DIR/${REMOTE_HOST}/ROOT/" {} +
+	
+	# anschliessend VOL und CONT anlegen
+	[ ! -d "$BACKUP_DIR/${REMOTE_HOST}/VOL" ] && mkdir -p "$BACKUP_DIR/${REMOTE_HOST}/VOL" 
+	[ ! -d "$BACKUP_DIR/${REMOTE_HOST}/CONT" ] && mkdir -p "$BACKUP_DIR/${REMOTE_HOST}/CONT" 
+}
+
 backup(){
 	read_config "$1"
 	
@@ -39,7 +56,7 @@ backup(){
 	echo ==================================================
 	
 	# neue Konfiguration lesen
-	source "$CONFIG_DIR/$1"
+	#source "$CONFIG_DIR/$1"
 	
 	# SCHRITT 1:
 	# sichern der MySQL-Datenbanken auf dem remote host
@@ -52,7 +69,7 @@ backup(){
 		for db in "${MYSQL_DB[@]}"
 		do
 			echo dumb database: "$db"
-			if [ "$MYSQL_CONTAINER" != '' ];
+			if [ "$MYSQL_CONTAINER" != '' ]
 			then
 				echo from container: "$MYSQL_CONTAINER"
 				ssh ${REMOTE_USER}@${REMOTE_HOST} "docker exec -i \"$MYSQL_CONTAINER\" mysqldump -u \"$MYSQL_USER\" \"-p$MYSQL_PASS\" --events --routines --triggers --single-transaction --add-drop-database -B \"$db\" > \"$MYSQL_DUMP_DIR/$db.sql\""
@@ -62,15 +79,20 @@ backup(){
 		done
 	
 		# Ordner mit SQL-Dateien in die Sicherung aufnehmen
+		if [ "$MYSQL_CONTAINER" != '' ]
+		then
+			FOLDERS=("$MYSQL_DUMP_DIR")
+		else
 			FOLDERS+=("$MYSQL_DUMP_DIR")
 		fi
+	fi
 
 	# SCHRITT 2:
 	# die Sicherung der Ordner (inklusive der SQL-Dump)
 	for dir in "${FOLDERS[@]}"
 	do
 		# prüfen ob das backup-ordner existiert ...
-		if [ ! -d "$BACKUP_DIR/${REMOTE_HOST}${dir}" ];
+		if [ ! -d "$BACKUP_DIR/${REMOTE_HOST}${dir}" ]
 		then
 			# ... und gegebenfals anlegen
 			mkdir -p "$BACKUP_DIR/${REMOTE_HOST}${dir}"
@@ -108,7 +130,7 @@ restore(){
 	echo ==================================================
 	
 	# neue Konfiguration lesen
-	source "$CONFIG_DIR/$1"
+	#source "$CONFIG_DIR/$1"
 	# SCHRITT 1:
 	# Alle Dateien und Ordner aus dem letzten Backup wiederherstellen
 	
@@ -143,6 +165,11 @@ restore(){
 	echo
 }
 
+test_function(){
+	read_config "$1"
+	echo $REMOTE_HOST
+}
+
 
 list(){
 	read_config "$1"
@@ -151,7 +178,7 @@ list(){
 	echo ==================================================
 	
 	# neue Konfiguration lesen
-	source "$CONFIG_DIR/$1"
+	#source "$CONFIG_DIR/$1"
 	
 	if [  ${#MYSQL_DB[@]} -gt 0 ]
 	then
@@ -189,6 +216,10 @@ elif [ "$1" == "--bash" ]; then
 	shift
 	/bin/bash "$@"
 	
+elif [ "$1" == "--testit" ]; then
+	shift
+	test_function "$@"
+	
 else
 	echo "usage ?"
 fi