From 5ead3d57016b29df8930f313c7c0d3d6f10a315b Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Wed, 18 Jan 2023 16:05:16 +0100 Subject: [PATCH] Restoring config file overwrites the config file we just deployed --- roles/forgejo/templates/forgejo_backup.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/forgejo/templates/forgejo_backup.sh.j2 b/roles/forgejo/templates/forgejo_backup.sh.j2 index a6418fe..2f71e19 100644 --- a/roles/forgejo/templates/forgejo_backup.sh.j2 +++ b/roles/forgejo/templates/forgejo_backup.sh.j2 @@ -72,7 +72,7 @@ do_restore() { chmod 600 "$tar_file" # Backup has changed permissions, restore them here echo "Extracting $tar_file..." && mkdir "$tar_dir" && tar xvzf "$tar_file" -C "$tar_dir" && echo " OK." cd "$tar_dir" || exit 1 - echo -n "Restoring $CONFIG_FILE..." && mv -f app.ini "$CONFIG_FILE" && echo " OK." + rm app.ini echo -n "Restoring $DATA_DIR..." && rsync -avz --delete data/ "$DATA_DIR" && rm -rf data && echo " OK." echo -n "Restoring $LOG_DIR..." && rsync -avz log/ "$LOG_DIR" && rm -rf log && echo " OK." echo -n "Restoring $REPO_DIR..." && mkdir -p "$REPO_DIR" && rsync -avz --delete repos/ "$REPO_DIR" && rm -rf repos && echo " OK."