3 files changed, 8 insertions(+), 17 deletions(-)

M sr.ht/builds.sr.ht/APKBUILD
M sr.ht/builds.sr.ht/builds.sr.ht.confd
M sr.ht/builds.sr.ht/builds.sr.ht.initd

@@ 1,7 1,7 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=builds.sr.ht
-pkgver=0.52.4
-pkgrel=1
+pkgver=0.60.2
+pkgrel=0
 pkgdesc="sr.ht build service"
 url="https://git.sr.ht/~sircmpwn/builds.sr.ht"
 arch="all"


@@ 30,14 30,12 @@ export PKGVER=$pkgver
 options="$options !check"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 	cd worker
 	go build
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --root="$pkgdir" --optimize=1
 	install -Dm755 "$srcdir"/builds.sr.ht.initd \
 		"$pkgdir"/etc/init.d/builds.sr.ht


@@ 64,8 62,8 @@ _worker() {
 		"$subpkgdir"/etc/conf.d/builds.sr.ht-worker
 }
 
-sha512sums="7f8c6abe8bbb7dd910288de9d8af1b65611f4e246e8fd5d7e53e636800938e6cde51895670cc66dcfceb1d4c71adf2a9530021554799ca278f38ba0828aebebc  builds.sr.ht-0.52.4.tar.gz
-68e4abe868cd16c00d96cc54be62272a2248333bf5ad12bb6519f976f8956bba1c3b2fd7f9d9bc87eb52fa31c9ef1f3ef1f96afccbb8f780ac470a3f2a229b3a  builds.sr.ht.confd
-a026f953aadb42bb3d0ba1146c4e09aac97f9fe8c1f348d1450fd336a3caa6121d914b259f340ea7a2240e8b28b7c2d7383f1541f8a7fe51cb4119821865fe23  builds.sr.ht.initd
+sha512sums="5e681fc07b713aef43f6187455bd1ed1fc3b8917ad30d21de35fcc80cc6431ba947c58252a16153bf1345bf640886f4acbfaf6ec9bd119264cb34031f2fa9536  builds.sr.ht-0.60.2.tar.gz
+0e3ede63309393e15e5b4ecd7d9c511ca2ecc6b99b50bac34c876a3261975b723a45643405aeb0c3b2533f879e854c1f2f3c6d152137611ea3fea72b9d52a045  builds.sr.ht.confd
+8efe408c19e088f83ad318d9c5388db1f54956acfd2a7daf75c0728acd40b26244eaea20c74a6f704018e2856831bc931c6646ca2f7842342763070ecc808033  builds.sr.ht.initd
 5aa18804ddfee263763b035780679b98cf4877de193c254f24fab7ce56f304556af9a377bfca36635c21b4380892e8d458a420021919934080cc43feda1694c4  builds.sr.ht-worker.confd
 8d0a501e76ef704c5eab78dc2cf609b2d033ceeff4f86f36a4b6d27dee9586f7fc855055500626449d57cd9c1fd833ab450b2639b6a85212d0eaf2b4a52bb0a5  builds.sr.ht-worker.initd"

@@ 6,9 6,3 @@
 
 # Extra arguments to pass to Gunicorn
 # BUILDS_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes
-
-# If no, use an external redis server
-# LOCAL_REDIS=yes

@@ 5,8 5,6 @@ supervisor=supervise-daemon
 BUILDS_USER=${BUILDS_USER:-builds}
 BUILDS_BIND=${BUILDS_BIND:-127.0.0.1:5002}
 BUILDS_ARGS=${BUILDS_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
 LOGS=/var/log/builds.sr.ht.log
 supervise_daemon_args="-1 $LOGS -2 $LOGS"
 command="/usr/bin/gunicorn"


@@ 16,8 14,9 @@ pidfile="/run/${RC_SVCNAME}.pid"
 
 depend() {
 	need net
-	[ "$LOCAL_REDIS" = "yes" ] && need redis
-	[ "$LOCAL_PG" = "yes" ] && need postgresql
+	use redis
+	use postgresql
+	use pgbouncer
 }
 
 start_pre() {