M sr.ht/git.sr.ht/APKBUILD => sr.ht/git.sr.ht/APKBUILD +5 -8
@@ 1,6 1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=git.sr.ht
-pkgver=0.51.0
+pkgver=0.54.2
pkgrel=0
pkgdesc="sr.ht git service"
url="https://git.sr.ht/~sircmpwn/git.sr.ht"
@@ 23,13 23,11 @@ source="
git.sr.ht-webhooks.initd
git.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 gitsrht-dispatch
go build
@@ 44,7 42,6 @@ build() {
}
package() {
- cd "$builddir"
python3 setup.py install --root="$pkgdir" --optimize=1
mkdir -p "$pkgdir"/etc/init.d
install -Dm755 "$srcdir"/git.sr.ht.initd \
@@ 72,10 69,10 @@ package() {
install -Dm755 gitsrht-api "$pkgdir"/usr/bin/gitsrht-api
}
-sha512sums="8ed47a1cd0824bd66b7342eafb5bcade7adff8ab03a175f2beef380f6b1ac3268412a7ecf9eb9bc8d99655f4b0298644917b46eece5d7a89c0b958b528a723fe git.sr.ht-0.51.0.tar.gz
-0afd86c1ca4615f52d24dfded4c3efeb2c1216b4b4f59ba46ecfa5da4c7f33865848065534dd6b56fbf63f98b3ea5e5e893fc8e83d5e2b86e1b9f118f2837948 git.sr.ht.initd
+sha512sums="38878163e6690bf1b052959a81e7a0ea00aa0432dbe9c7f59c4f483be1d875b4ea5415a6478737e6cca00d97c676d3f77519247ecc004557f036e2e8da0890fd git.sr.ht-0.54.2.tar.gz
+3debc75949507607a8572c2164b3785388cac46419a8d12cea5dc060a5effcb89913f6a873975dde732ea0749e899542055196979c44cb2d68ba226b96f1fd6c git.sr.ht.initd
4a66308d07c4d71306c15c73cb04efaee66188699304dbea62b295bb64b30b0d66147d6fec736bc7c0718bf43ccbff560db74499e664852fcbe9b157fbbd874f git.sr.ht.confd
-20265fb3516cc8c5226444752ffcb22acad797e7db036247593bce6d5349cb03cf6692f3567f35d36fbd52f6b50fabd1c6a444a6e188e057430a004de8f00637 git.sr.ht-api.initd
+370a9f710704d7dfe88632f0ae2b7d2b406621322cab1f87f4f4c3984c741fba616f9c2a806d83e79250dc58aba89161a2db8ca424794dbd2cacbffb6e1a9adb git.sr.ht-api.initd
9a115a47ea8db88575794c042809641dd4ab4a44706e290ea34c40e415474afbebff5adb0af7da5c5cf1fb5e9a4774587eae2207588562a4f7b0d2e651422190 git.sr.ht-api.confd
-2c0849d4582448e961ae4a021c20b9169dd508871a6587881f202f72cde59d066ce8c4cc5c4f1ab911d79a595b4cada4c41d85213c46f4f6304e85e2f0cb149d git.sr.ht-webhooks.initd
+4038c7375d50ab393d076d31d776e82a2fcd54d6edcd55eb864fcc8d7254646799b4ee05a2e1f75f3a79e660e802a0fa05d9e34c16870aebe33dbf8191ed386a git.sr.ht-webhooks.initd
e76b4b0ae51b040766b41da34082b6ea0f610a1039a3ce8b8d8ea496b90f52baf0a856a77b2aec7cd8dc0d2e57a6decca1c855fc2a779adc1baf7e3fe48bbaf0 git.sr.ht-webhooks.confd"
M sr.ht/git.sr.ht/git.sr.ht-api.confd => sr.ht/git.sr.ht/git.sr.ht-api.confd +0 -6
@@ 6,9 6,3 @@
# Extra arguments to pass to Gunicorn
# GIT_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes
-
-# If no, use an external redis server
-# LOCAL_REDIS=yes
M sr.ht/git.sr.ht/git.sr.ht-api.initd => sr.ht/git.sr.ht/git.sr.ht-api.initd +3 -4
@@ 5,8 5,6 @@ supervisor=supervise-daemon
GIT_USER=${GIT_USER:-git}
GIT_BIND=${GIT_BIND:-:5101}
GIT_ARGS=${GIT_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
LOGS=/var/log/git.sr.ht-api.log
supervise_daemon_args="-1 $LOGS -2 $LOGS"
command="/usr/bin/gitsrht-api"
@@ 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() {
M sr.ht/git.sr.ht/git.sr.ht-webhooks.confd => sr.ht/git.sr.ht/git.sr.ht-webhooks.confd +0 -3
@@ 3,6 3,3 @@
# Extra arguments to pass to celery
# GIT_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes
M sr.ht/git.sr.ht/git.sr.ht-webhooks.initd => sr.ht/git.sr.ht/git.sr.ht-webhooks.initd +3 -3
@@ 4,7 4,6 @@ description="git.sr.ht webhook delivery service"
supervisor=supervise-daemon
GIT_USER=${GIT_USER:-git}
GIT_ARGS=${GIT_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
LOGS=/var/log/git.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() {
M sr.ht/git.sr.ht/git.sr.ht.confd => sr.ht/git.sr.ht/git.sr.ht.confd +0 -6
@@ 6,9 6,3 @@
# Extra arguments to pass to Gunicorn
# GIT_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes
-
-# If no, use an external redis server
-# LOCAL_REDIS=yes
M sr.ht/git.sr.ht/git.sr.ht.initd => sr.ht/git.sr.ht/git.sr.ht.initd +3 -4
@@ 5,8 5,6 @@ supervisor=supervise-daemon
GIT_USER=${GIT_USER:-git}
GIT_BIND=${GIT_BIND:-127.0.0.1:5001}
GIT_ARGS=${GIT_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
LOGS=/var/log/git.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() {