Switch to uwsgi

and bump pkgrel

3 files changed, 65 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1b279b70a4e..c3045f21a3cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,34 @@
 pkgbase = searx
-	pkgdesc = A privacy-respecting, hackable metasearch engine
+	pkgdesc = A privacy-respecting, hackable metasearch engine (python(3) based)
 	pkgver = 0.15.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://asciimoo.github.io/searx/
 	arch = any
 	license = AGPL
 	makedepends = openssl
-	depends = python2-certifi
-	depends = python2-flask
-	depends = python2-flask-babel
-	depends = python2-lxml
-	depends = python2-idna
-	depends = python2-pygments
-	depends = python2-pyopenssl
-	depends = python2-dateutil
-	depends = python2-yaml
-	depends = python2-requests
-	depends = python2-pysocks
+	depends = uwsgi
+	depends = uwsgi-plugin-python
+	depends = python-certifi
+	depends = python-flask
+	depends = python-flask-babel
+	depends = python-lxml
+	depends = python-idna
+	depends = python-pygments
+	depends = python-pyopenssl
+	depends = python-dateutil
+	depends = python-yaml
+	depends = python-requests
+	depends = python-pysocks
 	conflicts = searx-git
+	conflicts = searx
 	backup = etc/searx/settings.yml
 	source = https://github.com/asciimoo/searx/archive/v0.15.0.zip
+	source = searx.ini
 	source = searx.sysusers
 	source = searx.service
 	sha512sums = 29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e
-	sha512sums = ec79f46f1e387234a0ae40c3b98c21b4ad16fc75153e3ea25f49a9b98c4f1cf62679686ae8c55273658b4bcbf74a083ce86adbdd25aa1705763fa3743aeff568
+	sha512sums = 6e1e7771e747e2bcb9cbc3e5ec9735461b6d791c0c0412e06e7dd802c18625edd0916de32164bf780c18ef7b6a87f55ed1e917377b3adb2bf53c0344f34b49e8
+	sha512sums = 0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f
 	sha512sums = 64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e
 
 pkgname = searx
diff --git a/PKGBUILD b/PKGBUILD
index 325c71004157..c2ae0b6e6324 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Jake <aur@ja-ke.tech>
 
-pkgname=searx-py3
-_pkgname=searx
+pkgname=searx
 pkgver=0.15.0
-pkgrel=1
-pkgdesc="A privacy-respecting, hackable metasearch engine (python3 based)"
+pkgrel=2
+pkgdesc="A privacy-respecting, hackable metasearch engine (python(3) based)"
 arch=('any')
 url="https://asciimoo.github.io/searx/"
 license=('AGPL')
 makedepends=('openssl')
 depends=(
+        'uwsgi'
+        'uwsgi-plugin-python'
         'python-certifi'
         'python-flask'
         'python-flask-babel'        
@@ -24,30 +25,33 @@ depends=(
 conflicts=('searx-git' 'searx')
 backup=('etc/searx/settings.yml')
 source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip"
+        'searx.ini'
         'searx.sysusers'
         'searx.service')
 sha512sums=('29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e'
+            '6e1e7771e747e2bcb9cbc3e5ec9735461b6d791c0c0412e06e7dd802c18625edd0916de32164bf780c18ef7b6a87f55ed1e917377b3adb2bf53c0344f34b49e8'
             '0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f'
             '64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e')
 
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   # Allow newer versions of the dependencies
   sed -i "s|==|>=|g" requirements.txt
   
   # Generate a random secret key
-  sed -i -e "s/ultrasecretkey\" # change this!/`openssl rand -hex 32`\"/g" $_pkgname/settings.yml
+  sed -i -e "s/ultrasecretkey\" # change this!/`openssl rand -hex 32`\"/g" $pkgname/settings.yml
 
   python3.7 setup.py install --root=$pkgdir --optimize=1
   
   mv $pkgdir/usr/lib/python3.7/site-packages/{README.rst,requirements*,tests,searx}
   
-  mkdir -p $pkgdir/etc/$_pkgname
-  mv $pkgdir/usr/lib/python3.7/site-packages/$_pkgname/settings.yml $pkgdir/etc/$_pkgname/
-  ln -s /etc/$_pkgname/settings.yml $pkgdir/usr/lib/python3.7/site-packages/$_pkgname/settings.yml
+  mkdir -p $pkgdir/etc/$pkgname
+  mv $pkgdir/usr/lib/python3.7/site-packages/$pkgname/settings.yml $pkgdir/etc/$pkgname/
+  ln -s /etc/$pkgname/settings.yml $pkgdir/usr/lib/python3.7/site-packages/$pkgname/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"
+  install -Dm644 "${srcdir}/searx.ini" "${pkgdir}/etc/uwsgi/searx.ini"
 }
diff --git a/searx.ini b/searx.ini
new file mode 100644
index 000000000000..7681436a1c7d
--- /dev/null
+++ b/searx.ini
@@ -0,0 +1,33 @@
+[uwsgi]

+http-socket = :8888

+

+# Who will run the code

+uid = searx

+gid = searx

+

+# disable logging for privacy

+disable-logging = false

+

+# Number of workers (usually CPU count)

+workers = 4

+

+# The right granted on the created socket

+chmod-socket = 666

+

+# Plugin to use and interpretor config

+single-interpreter = true

+master = true

+plugin = python

+lazy-apps = true

+enable-threads = true

+

+# Settings path for AUR package

+env = SEARX_SETTINGS_PATH=/etc/searx/settings.yml

+

+# Module to import

+module = searx.webapp

+

+# Virtualenv and python path

+#virtualenv = /usr/local/searx/searx-ve/

+#pythonpath = /usr/local/searx/

+#chdir = /usr/local/searx/searx/