diff --git a/roles/forgejo/tasks/backup.yml b/roles/forgejo/tasks/backup.yml index 21e49fd..3a23915 100644 --- a/roles/forgejo/tasks/backup.yml +++ b/roles/forgejo/tasks/backup.yml @@ -1,10 +1,10 @@ --- -- name: Copy forgejo_backup.sh script +- name: Copy forgejo-backup.sh script become: true ansible.builtin.template: - src: forgejo_backup.sh.j2 - dest: /usr/local/bin/forgejo_backup.sh + src: forgejo-backup.sh.j2 + dest: /usr/local/bin/forgejo-backup.sh owner: git group: git mode: 0700 diff --git a/roles/forgejo/tasks/repos.yml b/roles/forgejo/tasks/repos.yml index 5962eb0..ccc2e0a 100644 --- a/roles/forgejo/tasks/repos.yml +++ b/roles/forgejo/tasks/repos.yml @@ -41,6 +41,6 @@ become: true become_user: git ansible.builtin.command: - cmd: "/usr/local/bin/forgejo_backup.sh restore {{ latest_forgejo_dump.path }}" + cmd: "/usr/local/bin/forgejo-backup.sh restore {{ latest_forgejo_dump.path }}" # when this dir exists, the command won't run, so we don't overwrite existing repos creates: "{{ forgejo_run_dir }}/forgejo-repositories" diff --git a/roles/forgejo/templates/cron.d/forgejo-backup.j2 b/roles/forgejo/templates/cron.d/forgejo-backup.j2 index ee42a4b..2a852b0 100644 --- a/roles/forgejo/templates/cron.d/forgejo-backup.j2 +++ b/roles/forgejo/templates/cron.d/forgejo-backup.j2 @@ -1,3 +1,3 @@ # {{ ansible_managed }} -0 5 * * * git USER=git /usr/local/bin/forgejo_backup.sh backup >> {{ forgejo_backup_log_dir }}/backup.log 2>&1 && USER=git /usr/local/bin/forgejo_backup.sh prune 2 >> {{ forgejo_backup_log_dir }}/prune.log 2>&1 +0 5 * * * git USER=git /usr/local/bin/forgejo-backup.sh backup >> {{ forgejo_backup_log_dir }}/backup.log 2>&1 && USER=git /usr/local/bin/forgejo-backup.sh prune 2 >> {{ forgejo_backup_log_dir }}/prune.log 2>&1 diff --git a/roles/forgejo/templates/forgejo_backup.sh.j2 b/roles/forgejo/templates/forgejo-backup.sh.j2 similarity index 100% rename from roles/forgejo/templates/forgejo_backup.sh.j2 rename to roles/forgejo/templates/forgejo-backup.sh.j2