5 files changed, 12 insertions(+), 26 deletions(-)

M sr.ht/hg.sr.ht/APKBUILD
M sr.ht/hg.sr.ht/hg.sr.ht-webhooks.confd
M sr.ht/hg.sr.ht/hg.sr.ht-webhooks.initd
M sr.ht/hg.sr.ht/hg.sr.ht.confd
M sr.ht/hg.sr.ht/hg.sr.ht.initd

@@ 1,6 1,6 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=hg.sr.ht
-pkgver=0.23.0
+pkgver=0.26.10
 pkgrel=0
 pkgdesc="sr.ht mercurial service"
 url="https://hg.sr.ht/~sircmpwn/hg.sr.ht"


@@ 22,20 22,17 @@ source="
 	hg.sr.ht-webhooks.initd
 	hg.sr.ht-webhooks.confd
 "
-builddir="$srcdir/$pkgname-$pkgver"
 export PKGVER=$pkgver
 options="$options !check"
 install="$pkgname.post-install $pkgname.post-upgrade"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 	cd hgsrht-keys
 	go build
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --root="$pkgdir" --optimize=1
 	mkdir -p "$pkgdir"/etc/init.d
 	install -Dm755 "$srcdir"/hg.sr.ht.initd \


@@ 53,8 50,8 @@ package() {
 	install -Dm644 nonpublishing.cfg "$pkgdir"/etc/sr.ht/hgrcs/nonpublishing.cfg
 }
 
-sha512sums="893880173714977e74e08d3b6543d3b0c721c4ff887321b24918df969e556f3299d5d6597dfcc5946e743315013bda3aba58e9a702bd2f548f51c9babebfc5cb  hg.sr.ht-0.23.0.tar.gz
-23478d5e0ea9bbc8e372e3921048f0d8ee93caa690f9692b19bcbc0c58d50212e855acdf2a79624603d38287314c6c36ba27e6310d36458d0e0327e6579cf70f  hg.sr.ht.initd
-0a66de1b693f6abf7fbd3f566f8afaecaf2935c5d12e5105f2727c730b1ec4d3ef05a1f147ac245bf515a7aef47409564b441b77b94f51789f91c4c7e818b453  hg.sr.ht.confd
-83b25d3c08bcd4a92e28e1d14365e94108a95ef1836bdb863d753d5fdd7410cd8cddff23430bcc8bac0f35c6618d1e64f3e8fd0677dc527bc7950c0fdd1ee938  hg.sr.ht-webhooks.initd
-9708a018ab7ce31772aff489c57703614ae5f24021d23e440c2d256700e91a2b481d8070895b689ea690bf6e723e52c7aa823641505ab5871f0a321d998fc858  hg.sr.ht-webhooks.confd"
+sha512sums="3a7dcccead80ff9cd7586f0a2051e7105bde9e3a8e8b1750d476ac73f62ce60a45a2f634d65681ed4fc0875dc144545690bd2add5fbe2de80f04955420426b21  hg.sr.ht-0.26.10.tar.gz
+38923f14ca3cedf4004447ef5ab75d5699a858efdc22866f1da10a82c3a938227c03380b84fae719b84b4751f03fec55be922d950a155e09c7e8e41ff71b3c6b  hg.sr.ht.initd
+2c3f1776f8bb6bb42f0d240b28561d0bfb1b4638cad169cd5162f9c227028d0d256fd510f8a47c9c0ec111d11e9f54c293fef6c3e3d99d925dcd170294f44472  hg.sr.ht.confd
+93f25762da77462c8167ae53ba37ab4f9982c7f3c2d03dde445f0578758b808987c4781912a0fa5b4a4e25ba50c9d27477dfea8e319908ddc124dc836aefd2d6  hg.sr.ht-webhooks.initd
+af5bb605d8ba2e848de5755c9c7f1607591068f6ac79ddc1d312873e92218c6b535eb4cbcf10590656239459b7808ba5469d52d32f80e8e2448fc18c22f7a70c  hg.sr.ht-webhooks.confd"

@@ 3,6 3,3 @@
 
 # Extra arguments to pass to celery
 # HG_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes

@@ 4,7 4,6 @@ description="meta.sr.ht webhook delivery service"
 supervisor=supervise-daemon
 HG_USER=${HG_USER:-hg}
 HG_ARGS=${HG_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
 LOGS=/var/log/hg.sr.ht-webhooks.log
 supervise_daemon_args="-1 $LOGS -2 $LOGS"
 command="/usr/bin/celery"


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

@@ 6,10 6,3 @@
 
 # Extra arguments to pass to Gunicorn
 # HG_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
 HG_USER=${HG_USER:-hg}
 HG_BIND=${HG_BIND:-127.0.0.1:5010}
 HG_ARGS=${HG_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
 LOGS=/var/log/hg.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() {