diff options
author | Marcus Hoffmann | 2020-06-19 14:57:14 +0200 |
---|---|---|
committer | Marcus Hoffmann | 2020-06-19 17:11:44 +0200 |
commit | 3981d011ac19502fa3086a9ab0aebb81afd7298a (patch) | |
tree | 84c25decc96ea684a9fb8ab0bf2cc98f3da61612 | |
parent | e45d8cc5fdb9da3e99771432ff9335b47d5e304b (diff) | |
download | aur-3981d011ac19502fa3086a9ab0aebb81afd7298a.tar.gz |
update to 0.6.0.dev2
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | m_reg.log | 1 | ||||
-rw-r--r-- | matrix-registration.install | 11 | ||||
-rw-r--r-- | matrix-registration.service | 2 |
6 files changed, 28 insertions, 16 deletions
@@ -1,15 +1,15 @@ pkgbase = matrix-registration pkgdesc = Webapp for token based matrix registration - pkgver = 0.5.7.dev0 + pkgver = 0.6.0.dev2 pkgrel = 1 url = https://github.com/ZerataX/matrix-registration install = matrix-registration.install arch = any license = MIT - checkdepends = flake8 checkdepends = python-parameterized depends = python-appdirs depends = python-flask + depends = python-flask-sqlalchemy depends = python-flask-cors depends = python-flask-httpauth depends = python-flask-limiter @@ -19,10 +19,10 @@ pkgbase = matrix-registration depends = python-requests depends = python-wtforms depends = systemd - source = matrix-registration-0.5.7.dev0.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v0.5.7.dev0.tar.gz + source = matrix-registration-0.6.0.dev2.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v0.6.0.dev2.tar.gz source = matrix-registration.service - sha256sums = 8db9cc34350c6f1e20b489d9162e840c9d6c5cc9140f732881c0a25c7459bbe9 - sha256sums = e6855f64adaeff6be8cdf1106f62d1fe0f66e5015ff856e6db41e05f25bcd29a + sha256sums = 24109f973abd9ce2ec4bfe94b11a7c5b5e78565945245f4e772cffe52eee6ac3 + sha256sums = d4658ca6b2c6f8769f8f2a692c7428b72cd535fac7107fbc67ff4a8fe48370f8 pkgname = matrix-registration diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..574a8578368c --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/src +/pkg +*.tar.gz +*.tar.xz @@ -1,7 +1,7 @@ # Maintainer: Marcus Hoffmann <bubu@bubu1.eu> pkgname=matrix-registration -pkgver=0.5.7.dev0 +pkgver=0.6.0.dev2 pkgrel=1 pkgdesc="Webapp for token based matrix registration" @@ -9,21 +9,22 @@ url="https://github.com/ZerataX/matrix-registration" arch=('any') license=('MIT') -depends=('python-appdirs' 'python-flask' 'python-flask-cors' +depends=('python-appdirs' 'python-flask' 'python-flask-sqlalchemy' 'python-flask-cors' 'python-flask-httpauth' 'python-flask-limiter' 'python-waitress' 'python-dateutil' 'python-yaml' 'python-requests' 'python-wtforms' 'systemd') -checkdepends=('flake8' 'python-parameterized') +checkdepends=('python-parameterized') source=("matrix-registration-$pkgver.tar.gz::https://github.com/ZerataX/matrix-registration/archive/v$pkgver.tar.gz" "matrix-registration.service") -sha256sums=('8db9cc34350c6f1e20b489d9162e840c9d6c5cc9140f732881c0a25c7459bbe9' - 'e6855f64adaeff6be8cdf1106f62d1fe0f66e5015ff856e6db41e05f25bcd29a') +sha256sums=('24109f973abd9ce2ec4bfe94b11a7c5b5e78565945245f4e772cffe52eee6ac3' + 'd4658ca6b2c6f8769f8f2a692c7428b72cd535fac7107fbc67ff4a8fe48370f8') install=matrix-registration.install build() { cd $pkgname-$pkgver sed -i 's|"config"|"/etc/matrix-registration"|' setup.py + sed -i -e '/psycopg2-binary/d' setup.py python setup.py build } @@ -38,10 +39,5 @@ package() { cd $pkgname-$pkgver python setup.py install --root "$pkgdir" --optimize=1 --skip-build - _requires="$pkgdir"/usr/lib/python3.8/site-packages/matrix_registration-${pkgver}-py3.8.egg-info/requires.txt - sed -i 's/flask-limiter==.*/flask-limiter/' ${_requires} - sed -i 's/flask-cors==.*/flask-cors/' ${_requires} - sed -i 's/flask-httpauth==.*/flask-httpauth/' ${_requires} - sed -i 's/appdirs==.*/appdirs/' ${_requires} install -dm755 "$pkgdir"/etc/${pkgname} } diff --git a/m_reg.log b/m_reg.log new file mode 100644 index 000000000000..eec89ff913f6 --- /dev/null +++ b/m_reg.log @@ -0,0 +1 @@ +2020-06-08 22:44:48,895 - matrix_registration.tokens - INFO - connecting to /var/lib/matrix-registration/db.sqlite3 diff --git a/matrix-registration.install b/matrix-registration.install index d5810bdf7bd0..d623ee37290c 100644 --- a/matrix-registration.install +++ b/matrix-registration.install @@ -11,3 +11,14 @@ post_install() { EOF fi } + + +## arg 1: the new package version +## 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: + 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 +} diff --git a/matrix-registration.service b/matrix-registration.service index 3f0b15c98299..b6f91675b3b1 100644 --- a/matrix-registration.service +++ b/matrix-registration.service @@ -5,7 +5,7 @@ Requires=network-online.target [Service] Type=simple -ExecStart=/usr/bin/python3 -m matrix_registration --config-path /etc/matrix-registration/config.yaml api +ExecStart=/usr/bin/matrix_registration --config-path /etc/matrix-registration/config.yaml serve WorkingDirectory=/var/lib/matrix-registration DynamicUser=true ConfigurationDirectory=matrix-registration |