move settings.yml into /etc/searx

4 files changed, 17 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd792a70325f..1ae74a941e91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Sep  7 11:27:52 UTC 2016
+# Thu Sep 22 19:49:06 UTC 2016
 pkgbase = searx
 	pkgdesc = A privacy-respecting, hackable metasearch engine
 	pkgver = 0.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://asciimoo.github.io/searx/
 	install = searx.install
 	arch = any
@@ -21,13 +21,13 @@ pkgbase = searx
 	depends = python2-ndg-httpsclient
 	depends = python2-pysocks
 	conflicts = searx-git
-	backup = usr/lib/python2.7/site-packages/searx/settings.yml
+	backup = etc/searx/settings.yml
 	source = https://github.com/asciimoo/searx/archive/v0.10.0.zip
 	source = searx.install
 	source = searx.service
 	sha512sums = 2290dde2e26b8b219e8613c2c79b17a6d0ecd9170cf02b7c6cfe6bc1c0a67ca09b60c18d194e7086701218483ae0941e8e2001fd99eedc36b17a6fead7b4f4a3
-	sha512sums = 47d9b0509b0ac637d6bd0aa44213115e974bb3c943f2bce513732648bcea4616bf9fa550ef7d8fbaa580980793a2d8b69a9342d6a6e31604164e75f246fc3107
-	sha512sums = 07fbd0675c1bd05022bc79a3f7eb591d6f8276c1347beb6f99901014f01fd9c19638e8c4c8565b2ca248161d71ce8999474f5f1bc1b26494c6f4b63bfd07ab76
+	sha512sums = 984a7ed8a3bc2b7ad3703b58c50597959140d49242581449a6d616fd0c7ad021073a18962e76bad158c454860d5a77b89f207bcecd4e26273e1f46c5ef66d62f
+	sha512sums = 52beddcb3f31ef93eb6f722295ce34ab90bbdabf6697f9f42a53bb348b0c622040b2ba452b17c98f3d6f2b98a8a4461e26546a62a0328e761717f8a9040a241f
 
 pkgname = searx
 
diff --git a/PKGBUILD b/PKGBUILD
index a03bcc41dffd..fab37262f66d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=searx
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A privacy-respecting, hackable metasearch engine"
 arch=('any')
 url="https://asciimoo.github.io/searx/"
@@ -22,14 +22,14 @@ depends=('python2-flask'
         'python2-ndg-httpsclient'
         'python2-pysocks')
 conflicts=('searx-git')
-backup=('usr/lib/python2.7/site-packages/searx/settings.yml')
+backup=('etc/searx/settings.yml')
 install=searx.install
 source=('https://github.com/asciimoo/searx/archive/v0.10.0.zip'
         'searx.install'
         'searx.service')
 sha512sums=('2290dde2e26b8b219e8613c2c79b17a6d0ecd9170cf02b7c6cfe6bc1c0a67ca09b60c18d194e7086701218483ae0941e8e2001fd99eedc36b17a6fead7b4f4a3'
-            '47d9b0509b0ac637d6bd0aa44213115e974bb3c943f2bce513732648bcea4616bf9fa550ef7d8fbaa580980793a2d8b69a9342d6a6e31604164e75f246fc3107'
-            '07fbd0675c1bd05022bc79a3f7eb591d6f8276c1347beb6f99901014f01fd9c19638e8c4c8565b2ca248161d71ce8999474f5f1bc1b26494c6f4b63bfd07ab76')
+            '984a7ed8a3bc2b7ad3703b58c50597959140d49242581449a6d616fd0c7ad021073a18962e76bad158c454860d5a77b89f207bcecd4e26273e1f46c5ef66d62f'
+            '52beddcb3f31ef93eb6f722295ce34ab90bbdabf6697f9f42a53bb348b0c622040b2ba452b17c98f3d6f2b98a8a4461e26546a62a0328e761717f8a9040a241f')
 
 
 package() {
@@ -38,13 +38,17 @@ package() {
   # Allow newer versions of the dependencies
   sed -i "s|==|>=|g" requirements.txt
   
-  #Generate a random secret key
-  sed -i -e "s/ultrasecretkey/`openssl rand -hex 16`/g" searx/settings.yml
+  # Generate a random secret key
+  sed -i -e "s/ultrasecretkey\" # change this!/`openssl rand -hex 32`\"/g" searx/settings.yml
 
   python2 setup.py install --root=$pkgdir --optimize=1
   
   mv $pkgdir/usr/lib/python2.7/site-packages/{README.rst,searx/}
   mv $pkgdir/usr/lib/python2.7/site-packages/{tests,searx/}
+  
+  mkdir -p $pkgdir/etc/searx
+  mv $pkgdir/usr/lib/python2.7/site-packages/searx/settings.yml $pkgdir/etc/searx/
+  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
 }
diff --git a/searx.install b/searx.install
index 999d83d7cff6..4d15bed5edef 100644
--- a/searx.install
+++ b/searx.install
@@ -1,6 +1,6 @@
 post_install() {
   getent passwd searx >/dev/null || useradd -r searx
-  echo "Settings are at /usr/lib/python2.7/site-packages/searx/settings.yml"	
+  echo "Settings are at /etc/searx/settings.yml"	
 }
 
 post_upgrade() {
diff --git a/searx.service b/searx.service
index f8936b1be6c7..0bf6f9d24eb6 100644
--- a/searx.service
+++ b/searx.service
@@ -5,6 +5,7 @@ After=network.target
 [Service]
 Type=simple
 User=searx
+Environment=SEARX_SETTINGS_PATH=/etc/searx/settings.yml
 ExecStart=/usr/bin/searx-run
 Restart=on-abort