diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2021-07-27 05:32:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 05:32:57 +0000 |
| commit | beff764d7402e6a834f6dbb0a28921fc2577defe (patch) | |
| tree | d1fd3beb026c1199d60ffc67b9c6e79ddb8f5f80 /searx | |
| parent | 80f5241387aea1381dd96ed2b91ca62de927ba23 (diff) | |
| parent | e946c3462c2b44fb154d0b6595f4f42605a326e5 (diff) | |
| download | searxng-beff764d7402e6a834f6dbb0a28921fc2577defe.tar.gz searxng-beff764d7402e6a834f6dbb0a28921fc2577defe.zip | |
Merge pull request #216 from return42/fix-searx.sh
normalize environment of installation tasks (shell) with YAML settings
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/settings.yml | 24 | ||||
| -rw-r--r-- | searx/settings_defaults.py | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/searx/settings.yml b/searx/settings.yml index 70ac5ee49..ac9a14064 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -4,13 +4,16 @@ general: contact_url: false # mailto:contact@example.com brand: - git_url: https://github.com/searxng/searxng - git_branch: master - issue_url: https://github.com/searxng/searxng/issues new_issue_url: https://github.com/searxng/searxng/issues/new docs_url: https://searxng.github.io/searxng public_instances: https://searx.space wiki_url: https://github.com/searxng/searxng/wiki + issue_url: https://github.com/searxng/searxng/issues + + # If you change a value below don't forget to rebuild instance's enviroment + # (make buildenv) + git_url: https://github.com/return42/searxng + git_branch: fix-searx.sh search: # Filter results. 0: None, 1: Moderate, 2: Strict @@ -30,13 +33,16 @@ search: formats: [html, csv, json, rss] server: - port: 8888 - # address to listen on - bind_address: "127.0.0.1" + # If you change port, bind_address or base_url don't forget to rebuild + # instance's enviroment (make buildenv) + port: 7777 + bind_address: "127.0.0.12" + base_url: false # Possible values: false or "https://example.org/location". + + # If your instance owns a /etc/searx/settings.yml file, then set the following + # values there. + secret_key: "ultrasecretkey" # change this! - # Set custom base_url. Possible values: - # false or "https://your.custom.host/location/" - base_url: false # Proxying image results through searx image_proxy: false # 1.0 and 1.1 are supported diff --git a/searx/settings_defaults.py b/searx/settings_defaults.py index 0fa1f973d..72d7dc588 100644 --- a/searx/settings_defaults.py +++ b/searx/settings_defaults.py @@ -147,7 +147,7 @@ SCHEMA = { 'formats': SettingsValue(list, OUTPUT_FORMATS), }, 'server': { - 'port': SettingsValue(int, 8888), + 'port': SettingsValue((int,str), 8888, 'SEARX_PORT'), 'bind_address': SettingsValue(str, '127.0.0.1', 'SEARX_BIND_ADDRESS'), 'secret_key': SettingsValue(str, environ_name='SEARX_SECRET'), 'base_url': SettingsValue((False, str), False), |