diff --git a/searx/__init__.py b/searx/__init__.py index 7f76022e..11adbba7 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -66,43 +66,43 @@ class _brand_namespace: @classmethod def get_val(cls, group, name, default=''): - return settings[group].get(name, False) or '' + return settings.get(group, {}).get(name) or default @property def SEARX_URL(self): return self.get_val('server', 'base_url') + @property + def CONTACT_URL(self): + return self.get_val('general', 'contact_url') + @property def GIT_URL(self): - return self.get_val('general', 'git_url') + return self.get_val('brand', 'git_url') @property def GIT_BRANCH(self): - return self.get_val('general', 'git_branch') + return self.get_val('brand', 'git_branch') @property def ISSUE_URL(self): - return self.get_val('general', 'issue_url') + return self.get_val('brand', 'issue_url') @property def DOCS_URL(self): - return self.get_val('general', 'docs_url') + return self.get_val('brand', 'docs_url') @property def PUBLIC_INSTANCES(self): - return self.get_val('general', 'public_instances') - - @property - def CONTACT_URL(self): - return self.get_val('general', 'contact_url') + return self.get_val('brand', 'public_instances') @property def WIKI_URL(self): - return self.get_val('general', 'wiki_url') + return self.get_val('brand', 'wiki_url') @property def TWITTER_URL(self): - return self.get_val('general', 'twitter_url') + return self.get_val('brand', 'twitter_url') brand = _brand_namespace() diff --git a/searx/settings.yml b/searx/settings.yml index aff80fe5..30afbf95 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,12 +1,14 @@ general: debug : False # Debug mode, only for development instance_name : "searx" # displayed name + contact_url: False # mailto:contact@example.com + +brand: git_url: https://github.com/searx/searx git_branch: master issue_url: https://github.com/searx/searx/issues docs_url: https://searx.github.io/searx public_instances: https://searx.space - contact_url: False # mailto:contact@example.com wiki_url: https://github.com/searx/searx/wiki twitter_url: https://twitter.com/Searx_engine