diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
index 37721339986d463a3e363bdafcab996079816436..68bf67ba2ecd2db01427a0344dbe191622d10ff0 100644
--- a/apks/firefly3/APKBUILD
+++ b/apks/firefly3/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
pkgname=firefly3
pkgver=5.7.13
-pkgrel=0
+pkgrel=2
pkgdesc="A free and open source personal finance manager"
url="https://firefly-iii.org"
arch="noarch"
@@ -35,7 +35,10 @@ $pkgname-mysql:_mysql
$pkgname-psql:_psql
$pkgname-sqlite:_sqlite
"
-install="$pkgname.post-install"
+install="
+ $pkgname.pre-install
+ $pkgname.post-install
+"
source="
${pkgname}-${pkgver}.tar.gz::https://github.com/firefly-iii/firefly-iii/archive/refs/tags/$pkgver.tar.gz
firefly.nginx.conf
@@ -44,7 +47,7 @@ options="!check" # no clue how to run test on this
builddir="$srcdir/firefly-iii-$pkgver/"
package() {
- local wwwdir="usr/share/webapps/$pkgname"
+ local wwwdir="var/www/$pkgname"
mkdir -p "$pkgdir"
cd "$pkgdir"
@@ -54,25 +57,29 @@ cp -a "$builddir" ./$wwwdir
chmod +x ./$wwwdir/artisan
- cd "$wwwdir" && composer install --prefer-dist --no-dev --no-scripts
+ cd ./$wwwdir
+ composer install --prefer-dist --no-dev --no-scripts
+ cd ..
+
+ install -m 755 -o www-data -g www-data -d "$wwwdir"
}
_mysql() {
depends="firefly3 php8-pdo_mysql"
pkgdesc="Mysql dependencies for $pkgname"
- mkdir -p "$subpkgdir"/usr
+ mkdir -p "$subpkgdir"
}
_psql() {
depends=" firefly3 php8-pdo_pgsql php8-pgsql"
pkgdesc="Postgresql dependencies for $pkgname"
- mkdir -p "$subpkgdir"/usr
+ mkdir -p "$subpkgdir"
}
_sqlite() {
depends="firefly3 php8-pdo_sqlite"
pkgdesc="Sqlite dependencies for $pkgname"
- mkdir -p "$subpkgdir"/usr
+ mkdir -p "$subpkgdir"
}
_nginx() {
diff --git a/apks/firefly3/firefly3.pre-install b/apks/firefly3/firefly3.pre-install
new file mode 100644
index 0000000000000000000000000000000000000000..74f1b591e16d12b52c7f15812c77334cfe0f3151
--- /dev/null
+++ b/apks/firefly3/firefly3.pre-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+user=www-data
+group=www-data
+
+addgroup -S $group 2>/dev/null
+adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
+
+exit 0