diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-07-21 14:27:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 14:27:49 +0200 |
| commit | 4f0d232a3dc95042be809d6fa6e93ca746156658 (patch) | |
| tree | 4155de82568afd651558cb91a5d59aa256577a19 /utils/build_env.py | |
| parent | 17e028e57928f7925a2d1ee1177d28ff33ff8487 (diff) | |
| parent | 19abaf272def8faee5e7d3652d95413c3256d638 (diff) | |
Merge pull request #213 from return42/drop-brand
[mod] drop searx.brand namespace
Diffstat (limited to 'utils/build_env.py')
| -rw-r--r-- | utils/build_env.py | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/utils/build_env.py b/utils/build_env.py index ffb2689e9..c52111e81 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -16,18 +16,25 @@ os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + '/settings.yml') # from /etc/searx/settings.yml. os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml') -from searx import brand +from searx import get_setting + +def _env(*arg, **kwargs): + val = get_setting(*arg, **kwargs) + if val is True: + val = '1' + elif val is False: + val = '' + return val name_val = [ - ('SEARX_URL' , brand.SEARX_URL), - ('GIT_URL' , brand.GIT_URL), - ('GIT_BRANCH' , brand.GIT_BRANCH), - ('ISSUE_URL' , brand.ISSUE_URL), - ('DOCS_URL' , brand.DOCS_URL), - ('PUBLIC_INSTANCES' , brand.PUBLIC_INSTANCES), - ('CONTACT_URL' , brand.CONTACT_URL), - ('WIKI_URL' , brand.WIKI_URL), - ('TWITTER_URL' , brand.TWITTER_URL), + ('SEARX_URL' , _env('server.base_url','')), + ('GIT_URL' , _env('brand.git_url', '')), + ('GIT_BRANCH' , _env('brand.git_branch', '')), + ('ISSUE_URL' , _env('brand.issue_url', '')), + ('DOCS_URL' , _env('brand.docs_url', '')), + ('PUBLIC_INSTANCES' , _env('brand.public_instances', '')), + ('CONTACT_URL' , _env('general.contact_url', '')), + ('WIKI_URL' , _env('brand.wiki_url', '')), ] brand_env = 'utils' + sep + 'brand.env' |