ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity
2,845 Commits 3 Branches 17 Tags 53 MiB
Commit Graph

2845 Commits

Author SHA1 Message Date
Dalf 45702b77ca embedded iframe (youtube, dailymotion, vimeo): use https 2019-07-13 15:49:59 +02:00
Dalf 609ac5795a .travis.yml: robot tests: remove the xvfb dependency 2019-07-13 15:49:59 +02:00
Dalf fbe40001d3 Update Docker image 
See #1561 , use uwsgi and Alpine Linux

Volume:
/var/log/uwsgi contains error log for 2 days (file uwsgi.log)
/etc/searx contains the settings.yml and uwsgi.ini files.
The docker image creates them if they don't exist.
The two files can be modified after the first run. See below.

Environement variables:
MORTY_URL : external URL of Morty
MORTY_KEY : base64 encoded key
BASE_URL : external URL of Searx
BIND_ADDRESS : internal HTTP port to listen to

Labels : org.label-schema.schema.*

Parameters:
-h : display this help
-d : will update the settings and quit immediately (settings.yml and uwsgi.ini)
-f : always update the settings (previous version saved with suffix .old).
     without this parameter, the new settings are copied with suffix .new

When the Docker image contains newer settings:
- without -f parameter: the new versions are copied to /etc/searx/settings.yml.new and /etc/searx/uwsgi.ini.new.
- with -f parameter:  the old versions are renamed with .old suffix. The new version replaces /etc/searx/settings.yml and /etc/searx/uwsgi.ini

Build using "./manage.sh docker_build", add "push" as parameter also push the Docker image.
The script requires a git repository to work (it makes sure that the last git tag matches searx/version.py)
"git describe" is used to create a meaningful version.
Example : 0.15.0-90-49c5bcb4-dirty (dirty means that the docker image was made with uncommited changes).

Use "docker inspect -f {{.Config.Labels.version}} searx" to get the version of an existing image.

.dockerignore based on .gitignore

.travis.yml: include docker stage
 2019-07-13 15:49:59 +02:00
Alexandre Flament 3b8b862d8c
Merge branch 'master' into bang_fixes 2019-07-06 18:48:03 +02:00
Alexandre Flament 3faaf34e25
Fix ./manage.sh robot_tests (#1633) 
doi_resolvers / default_doi_resolver were missing in the settings_robots.yml file, so the test server was not able to start (crash). Since the output wasn't displayed, it was not obvious why the Selenium couldn't connect to searx.
 2019-07-06 18:47:35 +02:00
Marc Abonce Seguin 6626f01365 [fix] preserve bangs in suggestions and corrections 2019-07-01 19:52:34 -05:00
Marc Abonce Seguin 40272b0044 [fix] never pass bangs to autocomplete suggestions 2019-07-01 17:16:02 -05:00
Noémi Ványi 69c8ad86f3
Merge pull request #1614 from Nachtalb/ne/improve-infinite-scroll 
Improve infinite scroll (and with it fixing a bug)
 2019-06-30 13:49:16 +02:00
Noémi Ványi 6c75052874
Merge branch 'master' into ne/improve-infinite-scroll 2019-06-30 13:45:09 +02:00
Noémi Ványi 4c768f9fe6
Merge pull request #1590 from rachmadaniHaryono/feature/fix-config 
fix: dev: python3 dict keys jsonify
 2019-06-24 23:16:41 +02:00
Noémi Ványi 1e30f19800
Merge branch 'master' into feature/fix-config 2019-06-24 23:10:22 +02:00
Noémi Ványi 48ccc6c39a
Merge pull request #1620 from nfk/addr_setup 
Add addr setup via SEARX_BIND_ADDRESS
 2019-06-24 22:56:45 +02:00
Nicolas Gelot db1dfa4a28 Add addr setup via SEARX_BIND_ADDRESS 2019-06-17 22:42:56 +02:00
rachmadani haryono 697102af78
Merge branch 'master' into feature/fix-config 2019-06-09 19:50:19 +08:00
Nick Espig 06979fa082
Load next page shortly before hitting the bottom 
This improves the user experience by loading in the next entries shortly before him getting to the bottom. It makes the scrolling more smooth without a break in between.

It also fixes an error on my browser that scrolling never hits the defined number. When I debugged it I hit `.scrolltop` of 1092.5 and the `doc.height - win.height` of 1093, so the condition was never true.
 2019-06-04 18:22:02 +02:00
Noémi Ványi 8189b0d192
Merge pull request #1588 from rachmadaniHaryono/feature/fix-nose-coverage 
install coverage_plugin of nose2 instead of coverage-plugin
 2019-06-03 20:30:05 +02:00
rachmadani haryono 45eb2688d0
Merge branch 'master' into feature/fix-config 2019-05-29 19:17:28 +08:00
rachmadani haryono 43568a76dc
Merge branch 'master' into feature/fix-nose-coverage 2019-05-29 19:17:13 +08:00
Emilien Devos cbd1ebdce8 [fix] Force Google old UI (#1597) 2019-05-29 10:05:57 +09:00
rachmadani haryono ac357b12e3
Merge branch 'master' into feature/fix-config 2019-05-28 19:16:58 +08:00
rachmadani haryono 914141292f
Merge branch 'master' into feature/fix-nose-coverage 2019-05-28 19:16:46 +08:00
Frank de Lange 4b7332286a Use string formatter to create source and img_format labels (#1566) 
google_images :  use JSON embedded in HTML (engine expected pure JSON)
 2019-05-28 12:33:31 +09:00
Alexandre Flament a255651671
Merge pull request #1562 from asciimoo/settings 
Remove some engines : subtitleseeker, seedpeer, swisscows
 2019-05-28 11:14:15 +09:00
Dalf ffe0972f91 Remove some engines : subtitleseeker, seedpeer, swisscows 
http://www.subtitleseeker.com and http://www.seedpeer.eu don't exist anymore.
https://swisscows.ch/ has change : the engine needs to be updated
 2019-05-28 04:06:35 +02:00
rachmadani haryono 7a127b4547
Merge branch 'master' into feature/fix-config 2019-05-28 06:55:20 +08:00
rachmadaniHaryono 22a35f0362 fix: dev: nose package 2019-05-28 06:52:39 +08:00
Alexandre Flament 6c95ebcff5
Merge pull request #1595 from Venca24/fix_seznam 
[fix] seznam engine
 2019-05-28 07:27:40 +09:00
Alexandre Flament 9318551890
Merge branch 'master' into fix_seznam 2019-05-28 07:23:06 +09:00
Adam Tauber b6ae5c340d
Merge pull request #1605 from dalf/requirements 
requirements.txt : update dependencies
 2019-05-28 00:16:14 +02:00
Dalf 1418361cbc requirements.txt : update dependencies 2019-05-26 04:31:58 +02:00
Venca24 c66a019478 [fix] seznam engine 2019-05-21 14:27:30 +02:00
rachmadaniHaryono 9afc1b1e83 new: dev: test for config api 2019-05-18 18:58:05 +08:00
rachmadaniHaryono 535fff109f fix: dev: python3 dict keys jsonify 2019-05-18 00:03:49 +08:00
Alexandre Flament a84caa22cf
Merge pull request #1558 from brunob/patch-1 
simple theme : use instance_name for page title
 2019-04-19 10:04:53 +02:00
Alexandre Flament 9012ad498c
Merge branch 'master' into patch-1 2019-04-19 09:59:04 +02:00
Alexandre Flament 629b36d442
Merge pull request #1563 from Nachtalb/ne/fix-google-image-search 
Fix google image search engine
 2019-04-14 14:11:05 +02:00
Alexandre Flament df2b9a76f7
Merge branch 'master' into ne/fix-google-image-search 2019-04-14 13:55:00 +02:00
Nick Espig 1c6ab79b9f
Fix google image search 
- Because there is not full image url in the dom, we replace "image_url" with the same url as the "url" (url of source).
  See example HTML https://gist.github.com/Nachtalb/2dea8a4d2c723c49226ad9645838121f
- Remove unused import
- Fix google image search title
- Keep google image safe value up to date
 2019-04-14 12:03:25 +02:00
Alexandre Flament 30cdec37aa
Merge pull request #1565 from MarcAbonce/fix_duck_images 
[fix] DuckDuckGo Images requests
 2019-04-14 11:13:19 +02:00
Marc Abonce Seguin 3e1c2153f7 [fix] duckduckgo images requests 2019-04-13 00:38:37 -05:00
b_b 4ca7e68841
use instance_name for page title 
related to #1025
 2019-04-09 21:15:02 +02:00
Alexandre Flament 34d85c8c3c
Merge pull request #1533 from theel0ja/patch-1 
Use HTTPS for crossref
 2019-04-09 03:38:42 +02:00
Alexandre Flament 3e9ce2638a
Merge branch 'master' into patch-1 2019-04-09 03:32:39 +02:00
Alexandre Flament ca09d91023
Merge pull request #1544 from MarcAbonce/youtube_fix 
[fix] get YouTube results
 2019-04-09 03:26:27 +02:00
Alexandre Flament e868650df7
Merge branch 'master' into youtube_fix 2019-04-09 03:21:37 +02:00
Alexandre Flament 3ee804ec8c
Merge pull request #1545 from MarcAbonce/fix_duplicated_query 
[fix] Stop engine from sending duplicated requests
 2019-04-09 03:06:17 +02:00
Elias Ojala cef77f0d51
Merge branch 'master' into patch-1 2019-03-29 14:41:12 +00:00
Marc Abonce Seguin aaa0524cec [fix] stop engine from sending duplicated requests 2019-03-28 19:25:20 -06:00
Marc Abonce Seguin f2d49a6971 [fix] get youtube results from js object 
Results are not appearing in the html document anymore,
instead they are found inside an object embedded in a script.
 2019-03-26 21:09:15 -06:00
Dalf a80a2d05d1 Merge branch 'kvch-update-packages' 2019-03-24 07:41:42 +01:00