apkbuilds @ cc9e4011f8a8514431d1685b0d723e186b4b24c9

  1diff --git a/apks/genpass/APKBUILD b/apks/genpass/APKBUILD
  2index 7bf999d4d6edf4e99ae05381aafde547b95f51ad..3060a2fce7a7e084ad43c9f43b562b7ff2f88ff3 100644
  3--- a/apks/genpass/APKBUILD
  4+++ b/apks/genpass/APKBUILD
  5@@ -18,11 +18,15 @@     openssl-dev
  6     bzip2-dev
  7 "
  8 builddir="$srcdir/$pkgname-$pkgver/"
  9-subpackages="$pkgname-nginx:_nginx"
 10+subpackages="
 11+    $pkgname-nginx:_nginx
 12+    $pkgname-caddy:_caddy
 13+"
 14 
 15 source="
 16     https://artifacts.gabrielgio.me/archive/$pkgname/$pkgname-$pkgver.tar.gz
 17     $pkgname.nginx.conf
 18+    $pkgname.caddyfile
 19 "
 20 
 21 build() {
 22@@ -43,6 +47,15 @@ 	install -Dm644 "$srcdir"/"$package"/"$pkgname".nginx.conf \
 23 		"$subpkgdir"/etc/nginx/http.d/"$pkgname".nginx.conf
 24 }
 25 
 26+
 27+_caddy() {
 28+	depends="caddy genpass"
 29+	pkgdesc="caddy configuration for $pkgname"
 30+    mkdir -p "$subpkgdir"/etc/caddy/sites/
 31+	install -Dm644 "$srcdir"/"$package"/"$pkgname".caddyfile \
 32+		"$subpkgdir"/etc/caddy/sites/"$pkgname".caddyfile
 33+}
 34+
 35 package() {
 36     mkdir -p "$pkgdir"/var/www
 37     cp -dr public "$pkgdir"/var/www/"$pkgname"
 38@@ -51,4 +64,5 @@
 39 sha512sums="
 40 b07c2eb4987d1e6bd369b8d329b15a770471e0ae18fe8bcbec45bcfc80f9658068dc47a3ab70028d6d47bb2d19729ca5e63bef2b8c9077f29fd8591ecbeaa3d0  genpass-0.1.0.tar.gz
 41 6e6b9d80b26006efd5b6e368bd3925425b2080bf88dca38c91a9dd8a1db2b3774b2cb8ecba67ac01d2c822f0ad75106d6e103cc3371076f3f40232dd38b57fd4  genpass.nginx.conf
 42+8fd85d8c482595021f2592aa76f096a6ef97b56f8b89a39d65f1ddf799fe091f7ebeca735c1d9dfc44c17cd0f8300799e6cc4afc649221354c2021ecacab15fe  genpass.caddyfile
 43 "
 44diff --git a/apks/genpass/genpass.caddyfile b/apks/genpass/genpass.caddyfile
 45new file mode 100644
 46index 0000000000000000000000000000000000000000..87cea89d50a9c1078573424ba39bed89fbdd154a
 47--- /dev/null
 48+++ b/apks/genpass/genpass.caddyfile
 49@@ -0,0 +1,4 @@
 50+genpass.gabrielgio.me {
 51+    root * /var/www/genpass
 52+    file_server
 53+}
 54diff --git a/apks/jnfilter/APKBUILD b/apks/jnfilter/APKBUILD
 55index 74ebc875df06e577bc70ba8e3034cbbe178749a4..850f917b75248b4a8636def5f3624228313d5019 100644
 56--- a/apks/jnfilter/APKBUILD
 57+++ b/apks/jnfilter/APKBUILD
 58@@ -1,7 +1,7 @@
 59 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
 60 pkgname=jnfilter
 61 pkgver=0.1.1
 62-pkgrel=0
 63+pkgrel=1
 64 pkgdesc="Filtro for Joven Nerd's podcast feed"
 65 url="https://git.sr.ht/~gabrielgio/jnfilter"
 66 arch="noarch"
 67@@ -18,11 +18,13 @@ builddir="$srcdir/$pkgname-v$pkgver"
 68 subpackages="
 69     $pkgname-openrc
 70     $pkgname-nginx:_nginx:noarch
 71+    $pkgname-caddy:_caddy:noarch
 72 "
 73 source="
 74         $pkgname-$pkgver.tar.gz::https://git.sr.ht/~gabrielgio/$pkgname/archive/v$pkgver.tar.gz
 75         $pkgname.initd
 76         $pkgname.nginx.conf
 77+        $pkgname.caddyfile
 78         $pkgname.confd
 79 "
 80 provides="py3-jnfilter=$pkgver-r$pkgrel"
 81@@ -39,6 +41,16 @@ 	install -Dm644 "$srcdir"/"$package"/"$pkgname".nginx.conf \
 82 		"$subpkgdir"/etc/nginx/http.d/"$pkgname".nginx.conf
 83 }
 84 
 85+_caddy() {
 86+	depends="caddy jnfilter"
 87+	pkgdesc="caddy configuration for $pkgname"
 88+
 89+    mkdir -p "$subpkgdir"/etc/caddy/sites/
 90+
 91+	install -Dm644 "$srcdir"/"$package"/"$pkgname".caddyfile \
 92+		"$subpkgdir"/etc/caddy/sites/"$pkgname".caddyfile
 93+}
 94+
 95 package() {
 96     	# install scripts
 97 	install -m755 -D "$srcdir"/$pkgname.initd \
 98@@ -53,5 +65,6 @@ sha512sums="
 99 b7bba93dc85ffe9e86e1b0c7e3d1773d30aec9dd6797fc41b995a1a6b5687aa33e8f7ef26b9d26be6d5ffdbbe21d3750e97b15ebaf82dba4e63b9d82120f0cb2  jnfilter-0.1.1.tar.gz
100 4e9afb1c25218e78aa9ce033c76689613c55eeab2c3b460476ee64375c50b83f99e98ce504c9a9485ae55e186d02eb5d38715100343a8b59cab0f14aa7fa2346  jnfilter.initd
101 7edf3d3932a8af82aa5140523c517da2d697e10c197b784bd9d370baddccb66c25a67c4e2b1d64f7521e818258348e3153168256572ab5bc1b0f0bc73ffe6944  jnfilter.nginx.conf
102+6abd5060297c0bf38d3a12bbe34b01ee2e5df1b0600ac9458850f64d4647fe3c5eb9bdb4855645875e48fe74f64229abbdcc1b139ca14f89db6e795d3a09ebf6  jnfilter.caddyfile
103 00142d4a156bba4b714c2488674a53f82a95cbfd073aede159011de5aca415fe51481eee2bd225e376fd9cdf66ba95faa76beb038c896b6148454f940a58fffd  jnfilter.confd
104 "
105diff --git a/apks/jnfilter/jnfilter.caddyfile b/apks/jnfilter/jnfilter.caddyfile
106new file mode 100644
107index 0000000000000000000000000000000000000000..2670a085f13a853dcca0b1dd3e28f4136be904fe
108--- /dev/null
109+++ b/apks/jnfilter/jnfilter.caddyfile
110@@ -0,0 +1,3 @@
111+jnfilter.gabrielgio.me {
112+    reverse_proxy http://localhost:32000
113+}
114diff --git a/apks/midr/APKBUILD b/apks/midr/APKBUILD
115index 863dcd664fe813af550f0d2986f6af2fb53f7ff4..0a9b29edbb315748b9d94e5c7e746c9e586b7b92 100644
116--- a/apks/midr/APKBUILD
117+++ b/apks/midr/APKBUILD
118@@ -32,7 +32,6 @@         .
119 }
120 
121 package() {
122-
123 	install -Dm755 "$pkgname" "$pkgdir"/usr/lib/"$pkgname"/"$pkgname"
124 
125     mkdir -p "$pkgdir"/usr/bin
126diff --git a/apks/tres/APKBUILD b/apks/tres/APKBUILD
127index 547262bddee29117d42b5ca2b51ffa3a8b49eb7e..cea6ed6ba1096ad4d6b9ac80de416b9ecf84a767 100644
128--- a/apks/tres/APKBUILD
129+++ b/apks/tres/APKBUILD
130@@ -8,11 +8,15 @@ arch="noarch"
131 license="MIT"
132 options="!check" # this can't be tested
133 builddir="$srcdir/$pkgname-$pkgver/"
134-subpackages="$pkgname-nginx:_nginx:noarch"
135+subpackages="
136+    $pkgname-nginx:_nginx:noarch
137+    $pkgname-caddy:_caddy:noarch
138+"
139 
140 source="
141     https://artifacts.gabrielgio.me/archive/$pkgname/$pkgname-$pkgver.tar.gz
142     "$pkgname".nginx.conf
143+    "$pkgname".caddyfile
144 "
145 
146 build() {
147@@ -26,6 +30,14 @@ 	install -Dm644 "$srcdir"/"$package"/"$pkgname".nginx.conf \
148 		"$subpkgdir"/etc/nginx/http.d/"$pkgname".nginx.conf
149 }
150 
151+_caddy() {
152+	depends="caddy tres"
153+	pkgdesc="caddy configuration for $pkgname"
154+    mkdir -p "$subpkgdir"/etc/caddy/sites/
155+	install -Dm644 "$srcdir"/"$package"/"$pkgname".caddyfile \
156+		"$subpkgdir"/etc/caddy/sites/"$pkgname".caddyfile
157+}
158+
159 package() {
160     mkdir -p "$pkgdir"/usr/share/webapps/"$pkgname"
161     cp -dr index.html "$pkgdir"/usr/share/webapps/"$pkgname"
162@@ -34,4 +46,5 @@
163 sha512sums="
164 c8a10539b56026804843c62ff423ad5cc596fd49a04be4642f6319f2110679388554d0e45ea1928d7d2b8791e46b49d3d3a8d43c9c9d79d5ca96af5eea6ead64  tres-0.1.0.tar.gz
165 8dcf6312a400ce876d09bf2e050f50151c6a8f56bc8d7157e2769274ea472831601a7a2c9795d3eba64fe33ca0eaf723681e7ec3944b8ba61fde8df8a067cba0  tres.nginx.conf
166+5d3a0e00f7390f0f2a046c3012f0e5403108c8853c7dfcc4adaba1d3fbc30f73cea46148a8da498164eaad2473099c2b57ab28836c76d54fce1bc7c5533f0d0c  tres.caddyfile
167 "
168diff --git a/apks/tres/tres.caddyfile b/apks/tres/tres.caddyfile
169new file mode 100644
170index 0000000000000000000000000000000000000000..8bb21da07c50ef9f6fd85bd129281046bab7cbd6
171--- /dev/null
172+++ b/apks/tres/tres.caddyfile
173@@ -0,0 +1,4 @@
174+tres.gabrielgio.me {
175+    root * /usr/share/webapps/tres
176+    file_server
177+}