From babf3aee253532e39c7201d8c54a3c0acc108c81 Mon Sep 17 00:00:00 2001
From: Tunui Franken <tfranken@protonmail.com>
Date: Mon, 8 Jul 2024 10:56:11 +0200
Subject: [PATCH] Move forgejo-backup logs out of log dir

Otherwise the backup includes it's own logs while writing to them
---
 roles/forgejo/defaults/main/plain.yml        | 1 +
 roles/forgejo/tasks/backup.yml               | 9 +++++++++
 roles/forgejo/templates/forgejo_backup.sh.j2 | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/roles/forgejo/defaults/main/plain.yml b/roles/forgejo/defaults/main/plain.yml
index 2a79eb6..0bd3c76 100644
--- a/roles/forgejo/defaults/main/plain.yml
+++ b/roles/forgejo/defaults/main/plain.yml
@@ -19,6 +19,7 @@ forgejo_run_dir: /var/lib/forgejo
 forgejo_custom_dir: "{{ forgejo_run_dir }}/custom"
 forgejo_data_dir: "{{ forgejo_run_dir }}/data"
 forgejo_log_dir: /var/log/forgejo
+forgejo_backup_log_dir: /var/log/forgejo-backups
 forgejo_git_ssh_keys:
   pub: "{{ vault_forgejo_git_ssh_keys_pub }}"
   priv: "{{ vault_forgejo_git_ssh_keys_priv }}"
diff --git a/roles/forgejo/tasks/backup.yml b/roles/forgejo/tasks/backup.yml
index 657e963..e224cab 100644
--- a/roles/forgejo/tasks/backup.yml
+++ b/roles/forgejo/tasks/backup.yml
@@ -18,6 +18,15 @@
     group: git
     mode: 0755
 
+- name: Create forgejo-backup log directory
+  become: true
+  ansible.builtin.file:
+    path: "{{ forgejo_backup_log_dir }}"
+    state: directory
+    owner: git
+    group: git
+    mode: 0755
+
 - name: Setup forgejo-backup crontab
   become: true
   ansible.builtin.copy:
diff --git a/roles/forgejo/templates/forgejo_backup.sh.j2 b/roles/forgejo/templates/forgejo_backup.sh.j2
index 61c6252..6545095 100644
--- a/roles/forgejo/templates/forgejo_backup.sh.j2
+++ b/roles/forgejo/templates/forgejo_backup.sh.j2
@@ -20,7 +20,7 @@ DUMP_DIR={{ forgejo_run_dir }}/forgejo-dumps
 MYSQL_USER={{ forgejo_db_user }}
 MYSQL_DB={{ forgejo_db_name }}
 MYSQL_PW={{ forgejo_db_pass }}
-SCRIPT_LOGFILE={{ forgejo_log_dir }}/forgejo_backup.log
+SCRIPT_LOGFILE={{ forgejo_backup_log_dir }}/forgejo_backup.log
 
 {% raw %}
 if [ "$USER" != git ]; then