diff --git a/README.md b/README.md index 3559bb8..ee8eea0 100644 --- a/README.md +++ b/README.md @@ -131,8 +131,6 @@ backup_gitea_enabled: true backup_gitea_config: '/data/gitea/conf/app.ini' backup_gitea_docker_enabled: true backup_gitea_docker_container: 'gitea' -backup_gitea_docker_workdir: '/backup' -backup_gitea_docker_host_temp_dir: '/backup/temp' backup_cron_minute: 30 backup_cron_hour: 5 diff --git a/defaults/main.yml b/defaults/main.yml index 35132cc..5657da6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,6 +23,4 @@ backup_pg_docker_container: "" backup_gitea_enabled: false backup_gitea_config: "/data/gitea/conf/app.ini" backup_gitea_docker_enabled: false -backup_gitea_docker_container: "" -backup_gitea_docker_workdir: "/backup" -backup_gitea_docker_host_temp_dir: "{{ backup_dir }}/temp" +backup_gitea_docker_container: "" \ No newline at end of file diff --git a/templates/brain_backup.j2 b/templates/brain_backup.j2 index 0e4889f..671ff31 100644 --- a/templates/brain_backup.j2 +++ b/templates/brain_backup.j2 @@ -204,11 +204,8 @@ fi backup_gitea_config="{{ backup_gitea_config | default('/data/gitea/conf/app.ini') }}" backup_gitea_docker_enabled="{{ (backup_gitea_docker_enabled | default(false)) | ternary('true', 'false') }}" backup_gitea_docker_container="{{ backup_gitea_docker_container | default('') }}" -backup_gitea_docker_workdir="{{ backup_gitea_docker_workdir | default('/backup') }}" -backup_gitea_docker_host_temp_dir="{{ backup_gitea_docker_host_temp_dir | default(backup_dir ~ '/temp') }}" mkdir -p "$backup_dir/$today/gitea" -mkdir -p "$backup_dir/temp" if [ "$backup_gitea_docker_enabled" = "true" ]; then if [ -z "$backup_gitea_docker_container" ]; then @@ -216,15 +213,8 @@ if [ "$backup_gitea_docker_enabled" = "true" ]; then exit 1 fi - /usr/bin/docker exec -u git -i -w "$backup_gitea_docker_workdir" "$backup_gitea_docker_container" bash -c "/usr/local/bin/gitea dump -c \"$backup_gitea_config\" -q --type tar.gz" + /usr/bin/docker exec -u git -w /tmp gitea bash -c '/usr/local/bin/gitea dump -c "$backup_gitea_config" -q --type tar.gz -f -' > "$backup_dir/$today/gitea/gitea-dump.tar.gz" - gitea_latest_dump=$(ls -1t "$backup_gitea_docker_host_temp_dir"/gitea-dump-*.tar.gz 2>/dev/null | head -n 1) - if [ -z "$gitea_latest_dump" ]; then - echo "Gitea dump completed but no dump file found in $backup_gitea_docker_host_temp_dir: exiting." - exit 1 - fi - - mv "$gitea_latest_dump" "$backup_dir/$today/gitea/" else sudo su -s /bin/bash - git -c "cd $backup_dir/$today/gitea && /usr/local/bin/gitea dump -c \"$backup_gitea_config\" -q --type tar.gz" fi