Merge branch 'startpage'

2015-05-30 13:36:49 +02:00 · 2015-05-30 13:36:49 +02:00 · aac8d3a7bf
commit aac8d3a7bf
parent 5adb289a1c 484d0974f7
1 changed files with 8 additions and 5 deletions
--- a/searx/settings.yml
+++ b/searx/settings.yml
@ -203,12 +203,15 @@ engines:
  - name : startpage
    engine : startpage
    shortcut : sp
+    timeout : 6.0
+    disabled : True

-# +30% page load time
-#  - name : ixquick
-#    engine : startpage
-#    base_url : 'https://www.ixquick.com/'
-#    search_url : 'https://www.ixquick.com/do/search'
+  - name : ixquick
+    engine : startpage
+    base_url : 'https://www.ixquick.com/'
+    search_url : 'https://www.ixquick.com/do/search'
+    timeout : 6.0
+    disabled : True

  - name : twitter
    engine : twitter