diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 41 | ||||
| -rw-r--r-- | powerdns-admin.service | 2 |
3 files changed, 34 insertions, 33 deletions
@@ -1,19 +1,33 @@ pkgbase = powerdns-admin-git pkgdesc = Web GUI for PowerDNS autoritative server - pkgver = r220.e18757e - pkgrel = 3 + pkgver = r250.e49510c + pkgrel = 1 url = https://github.com/ngoduykhanh/PowerDNS-Admin install = powerdns-admin.install arch = any license = MIT makedepends = git - makedepends = python2-pip - makedepends = python2-virtualenv makedepends = libmariadbclient depends = python2 + depends = python2-flask + depends = python2-flask-wtf + depends = python2-flask-login + depends = python2-flask-sqlalchemy + depends = python2-configobj + depends = python2-bcrypt + depends = python2-requests + depends = python2-ldap + depends = python2-sqlalchemy + depends = python2-sqlalchemy-migrate + depends = python2-pyotp + depends = python2-qrcode + depends = python2-flask-oauthlib + depends = python2-dnspython optdepends = powerdns: autoritative server itself optdepends = postgresql: postgresql backend + optdepends = python2-psycopg2: postgresql adapter optdepends = mariadb: mysql backend + optdepends = mysql-python: mysql adapter options = !strip backup = etc/webapps/powerdns-admin/config.py source = powerdns-admin-git::git+https://github.com/ngoduykhanh/PowerDNS-Admin.git @@ -21,7 +35,7 @@ pkgbase = powerdns-admin-git source = powerdns-admin.service md5sums = SKIP md5sums = edde746cf96d975211b50ad649eb3b5b - md5sums = 14f2531802ca67453bd074ce83249f30 + md5sums = 4bd6a642f527d8cefc06b4df26b558a0 pkgname = powerdns-admin-git @@ -1,17 +1,23 @@ # Maintainer: Sergey Shatunov <me@prok.pw> pkgname=powerdns-admin-git -pkgver=r220.e18757e -pkgrel=3 +pkgver=r250.e49510c +pkgrel=1 pkgdesc="Web GUI for PowerDNS autoritative server" arch=('any') url="https://github.com/ngoduykhanh/PowerDNS-Admin" license=('MIT') options=(!strip) -depends=('python2') -makedepends=('git' 'python2-pip' 'python2-virtualenv' 'libmariadbclient') +depends=('python2' 'python2-flask' 'python2-flask-wtf' 'python2-flask-login' + 'python2-flask-sqlalchemy' + 'python2-configobj' 'python2-bcrypt' 'python2-requests' + 'python2-ldap' 'python2-sqlalchemy' 'python2-sqlalchemy-migrate' + 'python2-pyotp' 'python2-qrcode' 'python2-flask-oauthlib' 'python2-dnspython') +makedepends=('git' 'libmariadbclient') optdepends=('powerdns: autoritative server itself' 'postgresql: postgresql backend' - 'mariadb: mysql backend') + 'python2-psycopg2: postgresql adapter' + 'mariadb: mysql backend' + 'mysql-python: mysql adapter') install=powerdns-admin.install backup=(etc/webapps/powerdns-admin/config.py) source=('powerdns-admin-git::git+https://github.com/ngoduykhanh/PowerDNS-Admin.git' @@ -19,7 +25,7 @@ source=('powerdns-admin-git::git+https://github.com/ngoduykhanh/PowerDNS-Admin.g 'powerdns-admin.service') md5sums=('SKIP' 'edde746cf96d975211b50ad649eb3b5b' - '14f2531802ca67453bd074ce83249f30') + '4bd6a642f527d8cefc06b4df26b558a0') _uid=980 _gid=$_uid @@ -29,16 +35,9 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -build() { - cd "${srcdir}/${pkgname}" - virtualenv2 venv - virtualenv2 --relocatable venv - source venv/bin/activate - PIP_CONFIG_FILE=/dev/null pip2 install --isolated --ignore-installed -r requirements.txt psycopg2 MySQL-python -} - package() { cd "${pkgdir}" + install -o $_uid -g $_gid -d "etc/webapps/powerdns-admin" install -o $_uid -g $_gid -d "var/lib/powerdns-admin" install -d "usr/share/webapps" @@ -53,23 +52,11 @@ package() { ln -s /etc/webapps/powerdns-admin/config.py usr/share/webapps/powerdns-admin/config.py cp "${srcdir}/${pkgname}/config_template.py" etc/webapps/powerdns-admin/config.py - - find usr/share/webapps/powerdns-admin/venv/lib -name '*.pyc' -delete - + find usr/share/webapps/powerdns-admin -type f -print0 | xargs -0 sed -i \ -e 's#/usr/bin/python$#/usr/bin/python2#g' \ -e 's#/usr/bin/env python$#/usr/bin/env python2#g' - find usr/share/webapps/powerdns-admin/venv -type f -print0 | xargs -0 sed -i -E \ - -e 's#(VIRTUAL_ENV=)".+"#\1"/usr/share/webapps/powerdns-admin/venv"#g' \ - -e 's#(setenv VIRTUAL_ENV )".+"#\1"/usr/share/webapps/powerdns-admin/venv"#g' \ - -e 's#(set -gx VIRTUAL_ENV )".+"#\1"/usr/share/webapps/powerdns-admin/venv"#g' - sed -i -E -e 's#^\#!.+(venv/bin/python[0-9.]+)$#\#!/usr/share/webapps/powerdns-admin/venv\1#g' usr/share/webapps/powerdns-admin/venv/bin/{flask,migrate,migrate-repository,qr} - install -o $_uid -g $_gid /dev/stdin usr/share/webapps/powerdns-admin/powerdns-admin <<EOF -#!/usr/bin/env sh -source venv/bin/activate -./run.py -EOF chown -R $_uid:$_gid usr/share/webapps/powerdns-admin etc/webapps/powerdns-admin install ${srcdir}/powerdns-admin.service usr/lib/systemd/system/powerdns-admin.service diff --git a/powerdns-admin.service b/powerdns-admin.service index e0672a246334..b1ca64500f8d 100644 --- a/powerdns-admin.service +++ b/powerdns-admin.service @@ -7,7 +7,7 @@ Type=simple User=powerdns-admin Group=powerdns-admin WorkingDirectory=/usr/share/webapps/powerdns-admin -ExecStart=/usr/share/webapps/powerdns-admin/powerdns-admin +ExecStart=/usr/share/webapps/powerdns-admin/run.py CapabilityBoundingSet=CAP_NET_BIND_SERVICE NoNewPrivilegies=true PrivateTmp=true |