diff --git a/backup_filebrowser.sh b/backup_filebrowser.sh index 753e172..7d840ec 100755 --- a/backup_filebrowser.sh +++ b/backup_filebrowser.sh @@ -7,7 +7,7 @@ SAVE_PATH="/media/backup/backup_docker/$CONTAINER_NAME/files" NOW_DATETIME="$(date +'%Y%m%d_%H%M%S')" BACKUP_FILENAME="backup_${CONTAINER_NAME}_$NOW_DATETIME.tar" BACKUP_FILE_PATH="$SAVE_PATH/$BACKUP_FILENAME" -BACKUP_CMD="sudo tar -cvf $BACKUP_FILENAME $CONTAINER_NAME" +BACKUP_CMD="sudo tar cvf $BACKUP_FILENAME $CONTAINER_NAME" echo "DOCKER_DIR: $DOCKER_DIR" echo "CONTAINER_DIR: $CONTAINER_DIR" @@ -16,7 +16,7 @@ echo "NOW_DATETIME: $NOW_DATETIME" echo "BACKUP_FILENAME: $BACKUP_FILENAME" echo "BACKUP_FILE_PATH: $BACKUP_FILE_PATH" echo "BACKUP_CMD: $BACKUP_CMD" -echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" > /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" mkdir -p $SAVE_PATH sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml down @@ -25,11 +25,11 @@ $BACKUP_CMD sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml up -d ## Move BACKUP_FILENAME to BACKUP_FILE_PATH -echo "rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log -rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH +echo "rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH" +rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH ## Delete local backup file -echo "rm $BACKUP_FILENAME" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "rm $BACKUP_FILENAME" rm -f $BACKUP_FILENAME -echo "$(date +'%F %R:%S'): Backup finished." >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup finished." diff --git a/backup_freshrss.sh b/backup_freshrss.sh index 53f3c46..54b3823 100755 --- a/backup_freshrss.sh +++ b/backup_freshrss.sh @@ -7,7 +7,7 @@ SAVE_PATH="/media/backup/backup_docker/$CONTAINER_NAME/files" NOW_DATETIME="$(date +'%Y%m%d_%H%M%S')" BACKUP_FILENAME="backup_${CONTAINER_NAME}_$NOW_DATETIME.tar" BACKUP_FILE_PATH="$SAVE_PATH/$BACKUP_FILENAME" -BACKUP_CMD="sudo tar -cvf $BACKUP_FILENAME $CONTAINER_NAME" +BACKUP_CMD="sudo tar cvf $BACKUP_FILENAME $CONTAINER_NAME" echo "DOCKER_DIR: $DOCKER_DIR" echo "CONTAINER_DIR: $CONTAINER_DIR" @@ -16,7 +16,7 @@ echo "NOW_DATETIME: $NOW_DATETIME" echo "BACKUP_FILENAME: $BACKUP_FILENAME" echo "BACKUP_FILE_PATH: $BACKUP_FILE_PATH" echo "BACKUP_CMD: $BACKUP_CMD" -echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" > /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" mkdir -p $SAVE_PATH sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml down @@ -25,11 +25,11 @@ $BACKUP_CMD sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml up -d ## Move BACKUP_FILENAME to BACKUP_FILE_PATH -echo "rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log -rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH +echo "rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH" +rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH ## Delete local backup file -echo "rm $BACKUP_FILENAME" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "rm $BACKUP_FILENAME" rm -f $BACKUP_FILENAME -echo "$(date +'%F %R:%S'): Backup finished." >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup finished." diff --git a/backup_gitea.sh b/backup_gitea.sh index 23c120b..d61d1f3 100755 --- a/backup_gitea.sh +++ b/backup_gitea.sh @@ -7,7 +7,7 @@ SAVE_PATH="/media/backup/backup_docker/$CONTAINER_NAME/files" NOW_DATETIME="$(date +'%Y%m%d_%H%M%S')" BACKUP_FILENAME="backup_${CONTAINER_NAME}_$NOW_DATETIME.tar" BACKUP_FILE_PATH="$SAVE_PATH/$BACKUP_FILENAME" -BACKUP_CMD="sudo tar -cvf $BACKUP_FILENAME $CONTAINER_NAME" +BACKUP_CMD="sudo tar cvf $BACKUP_FILENAME $CONTAINER_NAME" echo "DOCKER_DIR: $DOCKER_DIR" echo "CONTAINER_DIR: $CONTAINER_DIR" @@ -16,7 +16,7 @@ echo "NOW_DATETIME: $NOW_DATETIME" echo "BACKUP_FILENAME: $BACKUP_FILENAME" echo "BACKUP_FILE_PATH: $BACKUP_FILE_PATH" echo "BACKUP_CMD: $BACKUP_CMD" -echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" > /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" mkdir -p $SAVE_PATH sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml down @@ -25,11 +25,11 @@ $BACKUP_CMD sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml up -d ## Move BACKUP_FILENAME to BACKUP_FILE_PATH -echo "rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log -rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH +echo "rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH" +rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH ## Delete local backup file -echo "rm $BACKUP_FILENAME" >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "rm $BACKUP_FILENAME" rm -f $BACKUP_FILENAME -echo "$(date +'%F %R:%S'): Backup finished." >> /home/awin/log/backup_docker_$CONTAINER_NAME.log +echo "$(date +'%F %R:%S'): Backup finished." diff --git a/backup_nextcloud.sh b/backup_nextcloud.sh index c18877a..86025fa 100755 --- a/backup_nextcloud.sh +++ b/backup_nextcloud.sh @@ -1,34 +1,35 @@ #!/bin/sh DOCKER_DIR="/lvm1/docker" -DOCKER_NEXTCLOUD_DIR="$DOCKER_DIR/nextcloud" -SAVE_PATH="/media/backup/backup_docker/nextcloud/files" +CONTAINER_NAME="nextcloud" +CONTAINER_DIR="$DOCKER_DIR/$CONTAINER_NAME" +SAVE_PATH="/media/backup/backup_docker/$CONTAINER_NAME/files" NOW_DATETIME="$(date +'%Y%m%d_%H%M%S')" -BACKUP_FILENAME="backup_nextcloud_$NOW_DATETIME.tar" +BACKUP_FILENAME="backup_${CONTAINER_NAME}_$NOW_DATETIME.tar" BACKUP_FILE_PATH="$SAVE_PATH/$BACKUP_FILENAME" -BACKUP_CMD="sudo tar -cvf $BACKUP_FILENAME nextcloud" +BACKUP_CMD="sudo tar cvf $BACKUP_FILENAME $CONTAINER_NAME" -echo "DOCKER_DIR: $DOCKER_DIR" -echo "DOCKER_NEXTCLOUD_DIR: $DOCKER_NEXTCLOUD_DIR" -echo "SAVE_PATH: $SAVE_PATH" -echo "NOW_DATETIME: $NOW_DATETIME" -echo "BACKUP_FILENAME: $BACKUP_FILENAME" -echo "BACKUP_FILE_PATH: $BACKUP_FILE_PATH" -echo "BACKUP_CMD: $BACKUP_CMD" -echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" > /home/awin/log/backup_docker_nextcloud.log +echo "DOCKER_DIR: $DOCKER_DIR" +echo "CONTAINER_DIR: $CONTAINER_DIR" +echo "SAVE_PATH: $SAVE_PATH" +echo "NOW_DATETIME: $NOW_DATETIME" +echo "BACKUP_FILENAME: $BACKUP_FILENAME" +echo "BACKUP_FILE_PATH: $BACKUP_FILE_PATH" +echo "BACKUP_CMD: $BACKUP_CMD" +echo "$(date +'%F %R:%S'): Backup start. BACKUP_CMD = $BACKUP_CMD" mkdir -p $SAVE_PATH -sudo docker compose -f $DOCKER_NEXTCLOUD_DIR/docker-compose.yml down +sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml down cd $DOCKER_DIR $BACKUP_CMD -sudo docker compose -f $DOCKER_NEXTCLOUD_DIR/docker-compose.yml up -d +sudo docker compose -f ${CONTAINER_DIR}/docker-compose.yml up -d ## Move BACKUP_FILENAME to BACKUP_FILE_PATH -echo "rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH" >> /home/awin/log/backup_docker_nextcloud.log -rsync -ah --progress $BACKUP_FILENAME $BACKUP_FILE_PATH +echo "rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH" +rsync -ah --progress $BACKUP_FILENAME $SAVE_PATH ## Delete local backup file -echo "rm $BACKUP_FILENAME" >> /home/awin/log/backup_docker_nextcloud.log +echo "rm $BACKUP_FILENAME" rm -f $BACKUP_FILENAME -echo "$(date +'%F %R:%S'): Backup finished." >> /home/awin/log/backup_docker_nextcloud.log +echo "$(date +'%F %R:%S'): Backup finished." diff --git a/clean_nextcloud.sh b/clean_nextcloud.sh index e269e00..c7048fd 100755 --- a/clean_nextcloud.sh +++ b/clean_nextcloud.sh @@ -1,6 +1,5 @@ #! /bin/bash LOG_FILE="/home/awin/log/nextcloud_clean.log" - +echo "$(date +'%F %R:%S'): Nexcloud clean start." sudo docker exec --user www-data nextcloud-nextcloud-1 php /var/www/html/cron.php -echo "$(date +'%F %R:%S'): Nexcloud clean finished." > $LOG_FILE - +echo "$(date +'%F %R:%S'): Nexcloud clean finished."