diff options
author | Marcus Hoffmann | 2021-06-19 21:52:33 +0200 |
---|---|---|
committer | Marcus Hoffmann | 2021-06-19 21:52:33 +0200 |
commit | 71439facf6efa0ed0bae0248adbf7e6522b3673f (patch) | |
tree | 93103d238e7cbf932528ebf09fafafe4326fd0c1 | |
parent | 2bf6c585a2003ee0f5327fedd47a86c20917949b (diff) | |
download | aur-71439facf6efa0ed0bae0248adbf7e6522b3673f.tar.gz |
update to 0.9.1
Adds alembic prestart db update command
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | matrix-registration.install | 5 | ||||
-rw-r--r-- | matrix-registration.service | 1 |
4 files changed, 15 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = matrix-registration pkgdesc = Webapp for token based matrix registration - pkgver = 0.8.0 + pkgver = 0.9.1 pkgrel = 2 url = https://github.com/ZerataX/matrix-registration install = matrix-registration.install @@ -19,10 +19,9 @@ pkgbase = matrix-registration depends = python-requests depends = python-wtforms depends = systemd - source = matrix-registration-0.8.0.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v0.8.0.tar.gz + source = matrix-registration-0.9.1.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v0.9.1.tar.gz source = matrix-registration.service - sha256sums = 00c8dc8a9b7dd821f82691e45df7659bfe073704a414c83319679f41baec4446 - sha256sums = 2b58afe380dc186ec1cb38838f8f6b819a1cdf5b1e674492986c80f39ed22dfd + sha256sums = c2d9e9c0c2068a2d7e097b0a3f00ce09e88cb064d2cfdb554ffa9e8641440787 + sha256sums = 36b204dea08c49e2f02f82cd469a828c1f99742339a9f4b8dd4bf59dbe2f9c45 pkgname = matrix-registration - @@ -1,7 +1,7 @@ # Maintainer: Marcus Hoffmann <bubu@bubu1.eu> pkgname=matrix-registration -pkgver=0.8.0 +pkgver=0.9.1 pkgrel=2 pkgdesc="Webapp for token based matrix registration" @@ -17,8 +17,8 @@ checkdepends=('python-parameterized') source=("matrix-registration-$pkgver.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v$pkgver.tar.gz" "matrix-registration.service") -sha256sums=('00c8dc8a9b7dd821f82691e45df7659bfe073704a414c83319679f41baec4446' - '2b58afe380dc186ec1cb38838f8f6b819a1cdf5b1e674492986c80f39ed22dfd') +sha256sums=('c2d9e9c0c2068a2d7e097b0a3f00ce09e88cb064d2cfdb554ffa9e8641440787' + '36b204dea08c49e2f02f82cd469a828c1f99742339a9f4b8dd4bf59dbe2f9c45') install=matrix-registration.install prepare() { @@ -43,14 +43,15 @@ build() { check() { cd $pkgname-$pkgver - python -m tests.test_registration -v + PYTHONPATH=build/lib python -m tests.test_registration -v } package() { install -Dm644 ${pkgname}.service "$pkgdir"/usr/lib/systemd/system/${pkgname}.service - cd $pkgname-$pkgver python setup.py install --root "$pkgdir" --optimize=1 --skip-build install -dm755 "$pkgdir"/etc/${pkgname} + mv ${pkgdir}/usr/{alembic,alembic.ini} ${pkgdir}/etc/${pkgname} + sed -i -e "s|script_location = alembic|script_location = /etc/${pkgname}/alembic/|" ${pkgdir}/etc/${pkgname}/alembic.ini } diff --git a/matrix-registration.install b/matrix-registration.install index d623ee37290c..7a740b5ac44a 100644 --- a/matrix-registration.install +++ b/matrix-registration.install @@ -17,8 +17,11 @@ post_install() { ## arg 2: the old package version post_upgrade() { [ $(vercmp "$2" '0.5.7') -gt 0 ] || cat <<EOF -Databse layer changed, if you have tokes without an expiration date set, you'll have to run the following migration manually: +Database layer changed, if you have tokes without an expiration date set, you'll have to run the following migration manually: update tokens set ex_date=null where ex_date='None'; The semantics of the db: field in the config.yaml file chnaged as well. Refer to the example config or SQLAlchemy documentation. EOF + [ $(vercmp "$2" '0.8.2') -gt 0 ] || cat <<EOF +Some config variables changed. Please refer to the config.sample.yml file to update your config. +EOF } diff --git a/matrix-registration.service b/matrix-registration.service index b7d8f1d04a6b..d6094e2abe11 100644 --- a/matrix-registration.service +++ b/matrix-registration.service @@ -5,6 +5,7 @@ Requires=network-online.target [Service] Type=simple +ExecStartPre=/usr/bin/alembic -c /etc/matrix-registration/alembic.ini -x config=/etc/matrix-registration/config.yaml upgrade head ExecStart=/usr/bin/matrix-registration --config-path /etc/matrix-registration/config.yaml serve WorkingDirectory=/var/lib/matrix-registration DynamicUser=true |