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

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

@@ 1,7 1,7 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=paste.sr.ht
-pkgver=0.9.0
-pkgrel=1
+pkgver=0.10.6
+pkgrel=0
 pkgdesc="sr.ht paste service"
 url="https://git.sr.ht/~sircmpwn/paste.sr.ht"
 arch="noarch"


@@ 18,18 18,15 @@ source="
 	paste.sr.ht.initd
 	paste.sr.ht.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
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --root="$pkgdir" --optimize=1
 	install -Dm755 "$srcdir"/paste.sr.ht.initd \
 		"$pkgdir"/etc/init.d/paste.sr.ht


@@ 37,6 34,6 @@ package() {
 		"$pkgdir"/etc/confd.d/paste.sr.ht
 }
 
-sha512sums="71989a47cb51351ce6367f063a3ec28efde5c0731609f536b3a01bf45f02ca3d8c516569fa8544b44b63eca871986daec488ede7e94f55160d4720d4312ea35a  paste.sr.ht-0.9.0.tar.gz
-d212f4e96a15b7db6f676a57ae9f8956456d3ec7d61e8cc2cfdcca30890cceaf1f38f87772f97143620ef9ec749fa54c3e0e1029e2a74b9dba95f1a571e0658b  paste.sr.ht.initd
-5ad67f8d07683186fd8b25e4075f6b83754bfd1a6072a494641601a73941b32be018335539cf34d15eee2200f7067fb4cf6f0a064cadc34d0c0b834b1a938d70  paste.sr.ht.confd"
+sha512sums="555acfefc8c83ec4210302f7282127e09548e3699d1c81e7450851dc3f180c356c1dcc97257d94e1375585e3dc34d1a24a7c42993fa894f6d65c01fcc90ae75a  paste.sr.ht-0.10.6.tar.gz
+ecbbfe19bbb60bb7724210bb38601dcf64cbd24056fb59d22ac4539082b6e30ac4d80b59d1e3ba58ac232df291304746b6deb49836c0a329233c3531baa33bda  paste.sr.ht.initd
+8b4f89e5d8fd96b6e898f81c7d5f516715285a4cb871a6bb31bcea059eb40aff5019039a973815aacd22eb9957bb02b2835a8e9c9aac3ab83649145c6636a388  paste.sr.ht.confd"

@@ 6,9 6,3 @@
 
 # Extra arguments to pass to Gunicorn
 # PASTE_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
 PASTE_USER=${PASTE_USER:-paste}
 PASTE_BIND=${PASTE_BIND:-127.0.0.1:5011}
 PASTE_ARGS=${PASTE_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
 LOGS=/var/log/paste.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() {