From c0a39a213babef601d0c8212d542a49301fc30e9 Mon Sep 17 00:00:00 2001
From: meaz <meaz@no-reply@disroot.org>
Date: Fri, 15 Sep 2023 13:27:27 +0000
Subject: [PATCH] v1.20.4 (#35)

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: https://git.disroot.org/Disroot-Ansible/forgejo/pulls/35
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
---
 defaults/main.yml                               | 6 ++++--
 templates/etc/systemd/system/forgejo.service.j2 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6f4b11b..ef36a0d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,13 +7,13 @@ forgejo_group: 'git'
 forgejo_confdir: '/etc/forgejo/app.ini'
 
 forgejo_flavor: 'forgejo'
-forgejo_version: '1.19.4-0'
+forgejo_version: '1.20.4-0'
 forgejo_arch: 'linux-amd64'
 #forgejo_download_url: 'https://github.com/go-gitea/gitea/releases/download/v{{ forgejo_version }}/gitea-{{ forgejo_version }}-{{ forgejo_arch }}'
 
 # Uncomment below if you want to add custom themes or images
 #forgejo_extra_files_path: '../img' # the folder name where you have the images you want to deploy
-#forgejo_theme_dir: '{{ forgejo_lib_dir }}/custom'
+forgejo_theme_dir: '{{ forgejo_lib_dir }}/custom'
 #forgejo_custom_themes:
 #  - name: '' #add name of the theme
 #    repo: '' #add git repository of the theme
@@ -25,6 +25,7 @@ forgejo_base_config:
   - 'APP_NAME = Forgejo: Beyond coding. We forge.'
   - 'RUN_USER = git'
   - 'RUN_MODE = prod'
+  - 'WORK_PATH = {{ forgejo_lib_dir }}'
 
 forgejo_oauth2_config:
   - 'JWT_SECRET = ' #41 random chars
@@ -59,6 +60,7 @@ forgejo_server_config:
   - 'LFS_START_SERVER = true'
   - 'LFS_JWT_SECRET   = ' #40 random chars
   - 'OFFLINE_MODE     = false'
+  - 'APP_DATA_PATH    = {{ forgejo_lib_dir }}/data/'
 
 forgejo_lfs_config: 
   - 'PATH = /home/git/data/lfs' 
diff --git a/templates/etc/systemd/system/forgejo.service.j2 b/templates/etc/systemd/system/forgejo.service.j2
index 1db9ab4..bb82696 100644
--- a/templates/etc/systemd/system/forgejo.service.j2
+++ b/templates/etc/systemd/system/forgejo.service.j2
@@ -19,11 +19,11 @@ RestartSec=2s
 Type=simple
 User={{ forgejo_user }}
 Group={{ forgejo_group }}
-WorkingDirectory=/var/lib/forgejo/
+WorkingDirectory={{ forgejo_lib_dir }}
 ExecStart={{ forgejo_bindir }}/forgejo web -c {{ forgejo_confdir }}
 Restart=always
 RestartSec=3
-Environment=USER={{ forgejo_user }} HOME=/home/{{ forgejo_user }} FORGEJO_WORK_DIR=/var/lib/forgejo FORGEJO_CUSTOM={{ forgejo_theme_dir }}
+Environment=USER={{ forgejo_user }} HOME=/home/{{ forgejo_user }} FORGEJO_WORK_DIR={{ forgejo_lib_dir }} FORGEJO_CUSTOM={{ forgejo_theme_dir }}
 # If you want to bind Forgejo to a port below 1024 uncomment
 # the two values below
 ###