apkbuilds @ 02be4323ddeee691a5dcba864b93ec9aa3d47f38

feat: Add firefly3 config folder

Now the env file is linked to the to the etc folder.
  1diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
  2index 68bf67ba2ecd2db01427a0344dbe191622d10ff0..9f113c013e756328be5b83f6edae040190e3cc44 100644
  3--- a/apks/firefly3/APKBUILD
  4+++ b/apks/firefly3/APKBUILD
  5@@ -1,12 +1,12 @@
  6 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
  7 pkgname=firefly3
  8 pkgver=5.7.13
  9-pkgrel=2
 10+pkgrel=4
 11 pkgdesc="A free and open source personal finance manager"
 12 url="https://firefly-iii.org"
 13 arch="noarch"
 14 license="AGPL-3.0-only"
 15-_php=php8
 16+_php=php81
 17 _php_mods="
 18     -curl
 19     -zip
 20@@ -41,13 +41,18 @@     $pkgname.post-install
 21 "
 22 source="
 23     ${pkgname}-${pkgver}.tar.gz::https://github.com/firefly-iii/firefly-iii/archive/refs/tags/$pkgver.tar.gz
 24-    firefly.nginx.conf
 25+
 26+    $pkgname.nginx.conf
 27+    $pkgname-env
 28 "
 29 options="!check" # no clue how to run test on this
 30 builddir="$srcdir/firefly-iii-$pkgver/"
 31 
 32 package() {
 33-    local wwwdir="var/www/$pkgname"
 34+    local wwwdir="usr/share/webapps/$pkgname"
 35+    local confdir="etc/$pkgname"
 36+
 37+    install -d -m 770 -o www-data -g www-data "$pkgdir"/$confdir
 38 
 39     mkdir -p "$pkgdir"
 40     cd "$pkgdir"
 41@@ -62,22 +67,27 @@     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+    install -m 660 -o www-data -g www-data \
 47+		"$srcdir"/$pkgname-env "$pkgdir"/$confdir/env
 48+
 49+    ln -s /$confdir/env "$pkgdir"/$wwwdir/.env
 50 }
 51 
 52 _mysql() {
 53-    depends="firefly3 php8-pdo_mysql"
 54+    depends="firefly3 php81-pdo_mysql"
 55 	pkgdesc="Mysql dependencies for $pkgname"
 56     mkdir -p "$subpkgdir"
 57 }
 58 
 59 _psql() {
 60-    depends=" firefly3 php8-pdo_pgsql php8-pgsql"
 61+    depends=" firefly3 php81-pdo_pgsql php81-pgsql"
 62     pkgdesc="Postgresql dependencies for $pkgname"
 63     mkdir -p "$subpkgdir"
 64 }
 65 
 66 _sqlite() {
 67-    depends="firefly3 php8-pdo_sqlite"
 68+    depends="firefly3 php81-pdo_sqlite"
 69     pkgdesc="Sqlite dependencies for $pkgname"
 70     mkdir -p "$subpkgdir"
 71 }
 72@@ -85,11 +95,12 @@
 73 _nginx() {
 74     depends="firefly3"
 75     pkgdesc="nginx configuration for $pkgname"
 76-    install -Dm644 "$srcdir/firefly.nginx.conf" \
 77-        "$subpkgdir"/etc/nginx/http.d/firefly.conf
 78+    install -Dm644 "$srcdir/$pkgname.nginx.conf" \
 79+        "$subpkgdir"/etc/nginx/http.d/$pkgname.conf
 80 }
 81 
 82 sha512sums="
 83 a59f89305eeb6cdb301ca86a6a3dfacd90497ce887b59b7c426bef341e7a070efc0d430c6e40277273e5aa56b86271c652f80e696cc53f0788b0624dd1b66a46  firefly3-5.7.13.tar.gz
 84-9d32e8e8bd805b09cd429eacc42fe9e746570cdc867531ac47a0b31801378e5e0fc357ef88e8d5c14617ba1887a3789a9d2f7150111b497377380df7ccdd08a7  firefly.nginx.conf
 85+9d32e8e8bd805b09cd429eacc42fe9e746570cdc867531ac47a0b31801378e5e0fc357ef88e8d5c14617ba1887a3789a9d2f7150111b497377380df7ccdd08a7  firefly3.nginx.conf
 86+b778a4113b8d4d3465a5f80a72fe04497d68d718751e2b0ee43fdbd4379b6278bdff74c68e095668f03ef3a9969de41d734cb4f7e27fb26f1a4342f0c9e0f57e  firefly3-env
 87 "
 88diff --git a/apks/firefly3/firefly.nginx.conf b/apks/firefly3/firefly3.nginx.conf
 89rename from apks/firefly3/firefly.nginx.conf
 90rename to apks/firefly3/firefly3.nginx.conf
 91diff --git a/apks/firefly3/firefly3-env b/apks/firefly3/firefly3-env
 92new file mode 100644
 93index 0000000000000000000000000000000000000000..201de191857ed877523ed35d6b802e9d903d4c34
 94--- /dev/null
 95+++ b/apks/firefly3/firefly3-env
 96@@ -0,0 +1,18 @@
 97+DB_CONNECTION=
 98+DB_HOST=
 99+DB_PORT=
100+DB_DATABASE=
101+DB_USERNAME=
102+DB_PASSWORD=
103+
104+APP_KEY=
105+
106+REDIS_SCHEME=
107+CACHE_DRIVER=
108+SESSION_DRIVER=
109+REDIS_HOST=
110+REDIS_PORT=
111+REDIS_PASSWORD=
112+
113+APP_DEBUG=
114+APP_LOG_LEVEL=
115diff --git a/apks/firefly3/firefly3.post-install b/apks/firefly3/firefly3.post-install
116index 0c5d88acf46a09e2377d26ab37a856b9815959c2..c74ae134075e59efece54b28ae09aec055b93193 100644
117--- a/apks/firefly3/firefly3.post-install
118+++ b/apks/firefly3/firefly3.post-install
119@@ -1,6 +1,6 @@
120 #!/bin/sh
121 
122-printf "  *\n  * Add the configration to '/var/www/firefly3/.env' \n"
123+printf "  *\n  * Add the configration to '/etc/firefly3/env' \n"
124 printf "  * Without it firefly3 won't run.\n  *\n"
125 
126 exit 0