1diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
2index 37721339986d463a3e363bdafcab996079816436..68bf67ba2ecd2db01427a0344dbe191622d10ff0 100644
3--- a/apks/firefly3/APKBUILD
4+++ b/apks/firefly3/APKBUILD
5@@ -1,7 +1,7 @@
6 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
7 pkgname=firefly3
8 pkgver=5.7.13
9-pkgrel=0
10+pkgrel=2
11 pkgdesc="A free and open source personal finance manager"
12 url="https://firefly-iii.org"
13 arch="noarch"
14@@ -35,7 +35,10 @@ $pkgname-mysql:_mysql
15 $pkgname-psql:_psql
16 $pkgname-sqlite:_sqlite
17 "
18-install="$pkgname.post-install"
19+install="
20+ $pkgname.pre-install
21+ $pkgname.post-install
22+"
23 source="
24 ${pkgname}-${pkgver}.tar.gz::https://github.com/firefly-iii/firefly-iii/archive/refs/tags/$pkgver.tar.gz
25 firefly.nginx.conf
26@@ -44,7 +47,7 @@ options="!check" # no clue how to run test on this
27 builddir="$srcdir/firefly-iii-$pkgver/"
28
29 package() {
30- local wwwdir="usr/share/webapps/$pkgname"
31+ local wwwdir="var/www/$pkgname"
32
33 mkdir -p "$pkgdir"
34 cd "$pkgdir"
35@@ -54,25 +57,29 @@ cp -a "$builddir" ./$wwwdir
36
37 chmod +x ./$wwwdir/artisan
38
39- cd "$wwwdir" && composer install --prefer-dist --no-dev --no-scripts
40+ cd ./$wwwdir
41+ composer install --prefer-dist --no-dev --no-scripts
42+ cd ..
43+
44+ install -m 755 -o www-data -g www-data -d "$wwwdir"
45 }
46
47 _mysql() {
48 depends="firefly3 php8-pdo_mysql"
49 pkgdesc="Mysql dependencies for $pkgname"
50- mkdir -p "$subpkgdir"/usr
51+ mkdir -p "$subpkgdir"
52 }
53
54 _psql() {
55 depends=" firefly3 php8-pdo_pgsql php8-pgsql"
56 pkgdesc="Postgresql dependencies for $pkgname"
57- mkdir -p "$subpkgdir"/usr
58+ mkdir -p "$subpkgdir"
59 }
60
61 _sqlite() {
62 depends="firefly3 php8-pdo_sqlite"
63 pkgdesc="Sqlite dependencies for $pkgname"
64- mkdir -p "$subpkgdir"/usr
65+ mkdir -p "$subpkgdir"
66 }
67
68 _nginx() {
69diff --git a/apks/firefly3/firefly3.pre-install b/apks/firefly3/firefly3.pre-install
70new file mode 100644
71index 0000000000000000000000000000000000000000..74f1b591e16d12b52c7f15812c77334cfe0f3151
72--- /dev/null
73+++ b/apks/firefly3/firefly3.pre-install
74@@ -0,0 +1,9 @@
75+#!/bin/sh
76+
77+user=www-data
78+group=www-data
79+
80+addgroup -S $group 2>/dev/null
81+adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
82+
83+exit 0