diff --git a/files/wanderer/backup.template.sh b/files/wanderer/backup.template.sh deleted file mode 100644 index e9eb936..0000000 --- a/files/wanderer/backup.template.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -eu -set -o pipefail - -echo "{{ app_name }}: backup data with gobackups" - -(cd "{{ base_dir }}" && gobackup perform --config "{{ gobackup_config }}") - -echo "{{ app_name }}: done." diff --git a/files/wanderer/gobackup.template.yml b/files/wanderer/gobackup.template.yml deleted file mode 100644 index 65e76fe..0000000 --- a/files/wanderer/gobackup.template.yml +++ /dev/null @@ -1,32 +0,0 @@ -# https://gobackup.github.io/configuration - -models: - - application: - compress_with: - type: 'tgz' - storages: - local: - type: 'local' - path: '{{ backups_dir }}' - keep: 3 - # databases: - # users: - # type: sqlite - # path: "{{ (data_dir, 'gramps_users/users.sqlite') | path_join }}" - # search_index: - # type: sqlite - # path: "{{ (data_dir, 'gramps_index/search_index.db') | path_join }}" - # sqlite: - # type: sqlite - # path: "{{ (data_dir, 'gramps_db/59a0f3d6-1c3d-4410-8c1d-1c9c6689659f/sqlite.db') | path_join }}" - # undo: - # type: sqlite - # path: "{{ (data_dir, 'gramps_db/59a0f3d6-1c3d-4410-8c1d-1c9c6689659f/undo.db') | path_join }}" - archive: - includes: - - "{{ data_dir }}" - # excludes: - # - "{{ (data_dir, 'gramps_cache') | path_join }}" - # - "{{ (data_dir, 'gramps_thumb_cache') | path_join }}" - # - "{{ (data_dir, 'gramps_tmp') | path_join }}" diff --git a/playbook-wanderer.yml b/playbook-wanderer.yml index a45fb01..c0171b3 100644 --- a/playbook-wanderer.yml +++ b/playbook-wanderer.yml @@ -9,8 +9,6 @@ app_owner_gid: 1019 base_dir: "{{ (application_dir, app_name) | path_join }}" data_dir: "{{ (base_dir, 'data') | path_join }}" - backups_dir: "{{ (base_dir, 'backups') | path_join }}" - gobackup_config: "{{ (base_dir, 'gobackup.yml') | path_join }}" wanderer_origin: "https://wanderer.vakhrushev.me" @@ -36,28 +34,17 @@ - "{{ (data_dir, 'pb_data') | path_join }}" - "{{ (data_dir, 'uploads') | path_join }}" - "{{ (data_dir, 'ms_data') | path_join }}" - - "{{ backups_dir }}" - - name: "Copy gobackup config" - ansible.builtin.template: - src: "./files/{{ app_name }}/gobackup.template.yml" - dest: "{{ gobackup_config }}" - owner: "{{ app_user }}" - group: "{{ app_user }}" - mode: "0640" - -# - name: "Copy backup script" -# ansible.builtin.template: -# src: "files/{{ app_name }}/backup.template.sh" -# dest: "{{ base_dir }}/backup.sh" -# owner: "{{ app_user }}" -# group: "{{ app_user }}" -# mode: "0750" - - - name: "Disable backup script" + # Бэкап идёт целиком через backup-targets: оркестратор backup-all.py читает + # этот файл и снимает data_dir как есть. Свой gobackup здесь не нужен — + # убираем то, что осталось от прежней схемы с дампом БД. + - name: "Remove legacy backup files" ansible.builtin.file: - dest: "{{ base_dir }}/backup.sh" + path: "{{ (base_dir, item) | path_join }}" state: absent + loop: + - "backup.sh" + - "gobackup.yml" - name: "Create backup targets file" ansible.builtin.copy: