summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake2018-08-21 22:51:43 +0200
committerJake2018-08-21 22:51:43 +0200
commitf56fede3c266affb75e1509633f0b18caeecb06c (patch)
tree6b4494e22f184b820cbfca277ca266c464d8ddea
parentc5ab3b698815567ea452d243399d2bdf3b633b0c (diff)
downloadaur-f56fede3c266affb75e1509633f0b18caeecb06c.tar.gz
Use sysusers
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD8
-rw-r--r--searx.install12
-rw-r--r--searx.sysusers1
4 files changed, 8 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4122c0a41ca4..3e954eef04cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = searx
pkgdesc = A privacy-respecting, hackable metasearch engine
pkgver = 0.14.0
- pkgrel = 1
+ pkgrel = 2
url = https://asciimoo.github.io/searx/
- install = searx.install
arch = any
license = AGPL
makedepends = openssl
@@ -21,10 +20,10 @@ pkgbase = searx
conflicts = searx-git
backup = etc/searx/settings.yml
source = https://github.com/asciimoo/searx/archive/v0.14.0.zip
- source = searx.install
+ source = searx.sysusers
source = searx.service
sha512sums = 97478d0dd61201510542d6574e7d59f43159fc30608257b8d31200567591e6fc0c1a41a6614e74e29988e4f76d0eae276688e060a6fe7d021fa29e23bbc80b76
- sha512sums = daf98a69d87dc78ea645a02146d67b0a2903b3b219edadf2e3c987c20d0751ac147b72fe185c74bfe3e0b154ed8ee4b9b503e7ca922548fad52157aada05803c
+ sha512sums = ec79f46f1e387234a0ae40c3b98c21b4ad16fc75153e3ea25f49a9b98c4f1cf62679686ae8c55273658b4bcbf74a083ce86adbdd25aa1705763fa3743aeff568
sha512sums = 64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e
pkgname = searx
diff --git a/PKGBUILD b/PKGBUILD
index 9fb6d55b8cfc..1b0546398b1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=searx
pkgver=0.14.0
-pkgrel=1
+pkgrel=2
pkgdesc="A privacy-respecting, hackable metasearch engine"
arch=('any')
url="https://asciimoo.github.io/searx/"
@@ -23,12 +23,11 @@ depends=( 'python2-certifi'
'python2-pysocks')
conflicts=('searx-git')
backup=('etc/searx/settings.yml')
-install=searx.install
source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip"
- 'searx.install'
+ 'searx.sysusers'
'searx.service')
sha512sums=('97478d0dd61201510542d6574e7d59f43159fc30608257b8d31200567591e6fc0c1a41a6614e74e29988e4f76d0eae276688e060a6fe7d021fa29e23bbc80b76'
- 'daf98a69d87dc78ea645a02146d67b0a2903b3b219edadf2e3c987c20d0751ac147b72fe185c74bfe3e0b154ed8ee4b9b503e7ca922548fad52157aada05803c'
+ 'ec79f46f1e387234a0ae40c3b98c21b4ad16fc75153e3ea25f49a9b98c4f1cf62679686ae8c55273658b4bcbf74a083ce86adbdd25aa1705763fa3743aeff568'
'64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e')
@@ -50,4 +49,5 @@ package() {
ln -s /etc/searx/settings.yml $pkgdir/usr/lib/python2.7/site-packages/searx/settings.yml
install -Dm0644 ../searx.service $pkgdir/usr/lib/systemd/system/searx.service
+ install -Dm644 "${srcdir}/searx.sysusers" "${pkgdir}/usr/lib/sysusers.d/searx.conf"
}
diff --git a/searx.install b/searx.install
deleted file mode 100644
index 189dbba0ccff..000000000000
--- a/searx.install
+++ /dev/null
@@ -1,12 +0,0 @@
-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"
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- echo "You may want to remove searx user"
-}
diff --git a/searx.sysusers b/searx.sysusers
new file mode 100644
index 000000000000..619442c379ff
--- /dev/null
+++ b/searx.sysusers
@@ -0,0 +1 @@
+u searx - "Searx server user" /usr/lib/python2.7/site-packages