diff options
| author | Jean Lucas | 2018-01-25 22:55:32 -0500 |
|---|---|---|
| committer | Jean Lucas | 2018-01-25 22:59:56 -0500 |
| commit | ba77b75260b0d059abcb325ee14c4d3c74962092 (patch) | |
| tree | fa89b4ced067570201f5148ce02368b272865a99 | |
| parent | 32534d6fca1611197d94c7861032c51077212e4a (diff) | |
| download | aur-ba77b75260b0d059abcb325ee14c4d3c74962092.tar.gz | |
Update dependencies, move requirements files into searx Python directory
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 64 | ||||
| -rw-r--r-- | searx.install | 10 | ||||
| -rw-r--r-- | searx.service | 9 |
4 files changed, 61 insertions, 45 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Feb 5 10:35:58 UTC 2017 +# Fri Jan 26 03:58:16 UTC 2018 pkgbase = searx-git pkgdesc = A privacy-respecting, hackable metasearch engine - pkgver = v0.11.0.r41.ge389a0c7 + pkgver = v0.13.1+43+gbec9906b pkgrel = 1 url = https://asciimoo.github.io/searx/ install = searx.install @@ -10,24 +10,25 @@ pkgbase = searx-git license = AGPL makedepends = git makedepends = openssl + depends = python-certifi depends = python2-flask depends = python2-flask-babel - depends = python2-requests depends = python2-lxml - depends = python2-yaml - depends = python2-dateutil + depends = python2-idna depends = python2-pygments - depends = python2-certifi - depends = python2-pyasn1-modules - depends = python2-ndg-httpsclient + depends = python2-pyopenssl + depends = python2-dateutil + depends = python2-yaml + depends = python2-requests depends = python2-pysocks + conflicts = searx backup = etc/searx/settings.yml source = git+https://github.com/asciimoo/searx.git source = searx.install source = searx.service - sha256sums = SKIP - sha256sums = f7ee8effdc16c6ac0cab089d9edc12d99dba95ac81b0b3568f87b4f59866f309 - sha256sums = 25b9ea2bbadfaad14c532b7796176272ff79d64c2c756e9cdaa5c2de25d0b03c + sha512sums = SKIP + sha512sums = 0356da11cb6079e1c80ff8009d309a20632b297eb472730b018ff92d98c6670321349c65518677a4b31020517049f2329dbbbfbed51c27972bbac2e2c6a3564d + sha512sums = 6bcc5854ebbe8a50f9929714d6d00f2b273b9c7dda16289868727edf2cf7f6c42b5de5d696efdc725b255f31f5d94867c05e94f7563adf587bc0a750212562ad pkgname = searx-git @@ -1,48 +1,56 @@ -# Maintainer: Jean Lucas <jean at 4ray dot co> +# Maintainer: Jean Lucas <jean@4ray.co> # Contributor: Reventlov <contact+aur at volcanis dot me> pkgname=searx-git -pkgver=v0.11.0.r41.ge389a0c7 +pkgver=v0.13.1+43+gbec9906b pkgrel=1 -pkgdesc="A privacy-respecting, hackable metasearch engine" -arch=('any') -url="https://asciimoo.github.io/searx/" -license=('AGPL') -makedepends=('git' 'openssl') -depends=('python2-flask' 'python2-flask-babel' 'python2-requests' 'python2-lxml' 'python2-yaml' 'python2-dateutil' 'python2-pygments' 'python2-certifi' 'python2-pyasn1-modules' 'python2-ndg-httpsclient' 'python2-pysocks') -backup=('etc/searx/settings.yml') +pkgdesc='A privacy-respecting, hackable metasearch engine' +arch=(any) +url='https://asciimoo.github.io/searx/' +license=(AGPL) +makedepends=(git openssl) +depends=(python-certifi + python2-flask + python2-flask-babel + python2-lxml + python2-idna + python2-pygments + python2-pyopenssl + python2-dateutil + python2-yaml + python2-requests + python2-pysocks) +conflicts=(searx) +backup=(etc/searx/settings.yml) install=searx.install -source=('git+https://github.com/asciimoo/searx.git' - 'searx.install' - 'searx.service') -sha256sums=('SKIP' - 'f7ee8effdc16c6ac0cab089d9edc12d99dba95ac81b0b3568f87b4f59866f309' - '25b9ea2bbadfaad14c532b7796176272ff79d64c2c756e9cdaa5c2de25d0b03c') +source=(git+https://github.com/asciimoo/searx.git + searx.install + searx.service) +sha512sums=(SKIP + 0356da11cb6079e1c80ff8009d309a20632b297eb472730b018ff92d98c6670321349c65518677a4b31020517049f2329dbbbfbed51c27972bbac2e2c6a3564d + 6bcc5854ebbe8a50f9929714d6d00f2b273b9c7dda16289868727edf2cf7f6c42b5de5d696efdc725b255f31f5d94867c05e94f7563adf587bc0a750212562ad) pkgver() { - cd $srcdir/searx/ - ( set -o pipefail - git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" - ) + cd $srcdir/searx + + git describe --tags | sed 's/-/+/g' } prepare() { - cd $srcdir/searx/ + cd $srcdir/searx + sed -i 's|==|>=|g' requirements.txt - msg2 "Generating secret key..." sed -i "s/ultrasecretkey\" # change this!/`openssl rand -hex 128`\"/g" searx/settings.yml } package() { - cd $srcdir/searx/ + cd $srcdir/searx + python2 setup.py install --root=$pkgdir --optimize=1 - cd $pkgdir/usr/lib/python2.7/site-packages/ - mv README.rst searx/ - mv tests searx/ + mv $pkgdir/usr/lib/python2.7/site-packages/{README.rst,requirements*,tests,searx} - install -Dm 0644 searx/settings.yml $pkgdir/etc/searx/settings.yml - install -Dm 0644 $srcdir/searx.service $pkgdir/usr/lib/systemd/system/searx.service + install -Dm 644 searx/settings.yml $pkgdir/etc/searx/settings.yml + install -Dm 644 $srcdir/searx.service $pkgdir/usr/lib/systemd/system/searx.service } diff --git a/searx.install b/searx.install index 2ce4ba49c28c..e429034b58ed 100644 --- a/searx.install +++ b/searx.install @@ -1,8 +1,14 @@ post_install() { - getent passwd searx >/dev/null || useradd -rb /usr/lib/python2.7/site-packages -s /usr/bin/nologin searx - echo "==> Settings are at /etc/searx/settings.yml" + getent passwd searx > /dev/null || + useradd -rb /usr/lib/python2.7/site-packages -s /sbin/nologin searx + + echo "Settings are at /etc/searx/settings.yml" } post_upgrade() { post_install } + +post_remove() { + echo "You may want to remove the searx user." +} diff --git a/searx.service b/searx.service index aa436128ed4f..dfa3ccb95fbf 100644 --- a/searx.service +++ b/searx.service @@ -3,17 +3,18 @@ Description=Searx server After=network.target [Service] +Type=simple +User=searx +Environment=SEARX_SETTINGS_PATH=/etc/searx/settings.yml PrivateTmp=true PrivateDevices=true # Prevent access to /home, /root, and /run/user ProtectHome=true # Prevent writes to /usr, /boot, and /etc ProtectSystem=full -Environment=SEARX_SETTINGS_PATH=/etc/searx/settings.yml -Type=simple -User=searx ExecStart=/usr/bin/searx-run -Restart=on-abort +Restart=on-failure +RestartSec=1 [Install] WantedBy=multi-user.target |