Merge 53c139853736f947e78c59a6d3398108fa1d2232 into cc97a5a5f5980e2742a1a2ac6b084210e071ff1e

searx/__init__.py

 import logging
 from os import environ
 from os.path import realpath, dirname, join, abspath, isfile
-from io import open
+from io import open as io_open
 from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
 try:
     from yaml import load
 engine_dir = dirname(realpath(__file__))
 
 
-def check_settings_yml(file_name):
+def build_key_to_index(seq, key):
+    return dict((d[key], index) for (index, d) in enumerate(seq))
+
+
+def file_or_none(file_name):
     if isfile(file_name):
         return file_name
     else:
         return None
 
+
+def load_yaml(file_name):
+    with io_open(file_name, 'r', encoding='utf-8') as file_yaml:
+        return load(file_yaml)
+
+
+def get_embedded_filename(name):
+    return join(searx_dir, name)
+
+
+def update_settings_with_path(settings, path, key=None):
+    if path is None or path == '':
+        return
+    elif isfile(path):
+        logger.debug('read configuration from %s', path)
+        y = load_yaml(path)
+        if isinstance(settings, dict):
+            settings.update(y)
+        elif isinstance(settings, list):
+            kindex = build_key_to_index(settings, key)
+            for e in y:
+                if key is not None and key in e:
+                    i = kindex.get(e[key], None)
+                    if i is not None:
+                        settings[i] = e
+                        continue
+                settings.append(e)
+        else:
+            logger.error('%s content is neither a list nor a dictionary')
+    else:
+        logger.error('%s is not a file', path)
+
+
 # find location of settings.yml
 if 'SEARX_SETTINGS_PATH' in environ:
     # if possible set path to settings using the
     # enviroment variable SEARX_SETTINGS_PATH
-    settings_path = check_settings_yml(environ['SEARX_SETTINGS_PATH'])
+    user_settings_path = file_or_none(environ['SEARX_SETTINGS_PATH'])
 else:
     # if not, get it from searx code base or last solution from /etc/searx
-    settings_path = check_settings_yml(join(searx_dir, 'settings.yml')) or check_settings_yml('/etc/searx/settings.yml')
+    user_settings_path = file_or_none(get_embedded_filename('settings.yml')) or file_or_none('/etc/searx/settings.yml')
 
-if not settings_path:
+if not user_settings_path:
     raise Exception('settings.yml not found')
 
-# load settings
-with open(settings_path, 'r', encoding='utf-8') as settings_yaml:
-    settings = load(settings_yaml)
+user_settings = load_yaml(user_settings_path)
 
 '''
 enable debug if
 elif searx_debug_env == 'false' or searx_debug_env == '0':
     searx_debug = False
 else:
-    searx_debug = settings.get('general', {}).get('debug')
+    searx_debug = user_settings.get('general', {}).get('debug')
 
 if searx_debug:
     logging.basicConfig(level=logging.DEBUG)
     logging.basicConfig(level=logging.WARNING)
 
 logger = logging.getLogger('searx')
-logger.debug('read configuration from %s', settings_path)
+logger.debug('read configuration from %s', user_settings_path)
 # Workaround for openssl versions <1.0.2
 # https://github.com/certifi/python-certifi/issues/26
 if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2):
         environ['REQUESTS_CA_BUNDLE'] = certifi.old_where()
     logger.warning('You are using an old openssl version({0}), please upgrade above 1.0.2!'.format(OPENSSL_VERSION))
 
+'''
+Load all settings
+'''
+# settings are merged from different yml files
+settings = {
+    'search': {
+        'engines': list()
+    },
+    'engines': list(),
+    'locales': dict(),
+    'doi': dict()
+}
+# load embedded settings first
+update_settings_with_path(settings['engines'],
+                          user_settings.get('search', {}).get('engines_path', None)
+                          or get_embedded_filename('engines.yml'))
+update_settings_with_path(settings['doi'], get_embedded_filename('doi.yml'))
+update_settings_with_path(settings['locales'], get_embedded_filename('locales.yml'))
+# load user settings (may override embedded settings)
+settings.update(user_settings)
+# add additional engines (replace engine definition if it already exists)
+update_settings_with_path(settings['engines'],
+                          user_settings.get('search', {}).get('include_engines_path', None), 'name')
+# are there some user engine settings ?
+user_engine_settings = settings.get('search', {}).get('engines', None)
+if user_engine_settings:
+    # Yes there are, so disable all engines by default
+    for e in settings['engines']:
+        e['disabled'] = True
+
+    # merge settings "search.engines" into "engines"
+    engines_by_names = build_key_to_index(settings['engines'], 'name')
+    for e in user_engine_settings:
+        name = e['name']
+        del e['name']
+        # enable engine
+        e['disabled'] = False
+        # merge settings
+        if name in engines_by_names:
+            settings['engines'][engines_by_names[name]].update(e)
+        else:
+            logger.error('{0} is not an engine')
+
+    # merge done : delete user engine settings
+    del settings['search']['engines']
+
+#
 logger.info('Initialisation done')
 
 if 'SEARX_SECRET' in environ:

searx/doi.yml

+resolvers :
+  oadoi.org : 'https://oadoi.org/'
+  doi.org : 'https://doi.org/'
+  doai.io  : 'http://doai.io/'
+default: 'oadoi.org'

searx/engines.yml

+- name : arch linux wiki
+  engine : archlinux
+  shortcut : al
+
+- name : archive is
+  engine : xpath
+  search_url : https://archive.is/{query}
+  url_xpath : (//div[@class="TEXT-BLOCK"]/a)/@href
+  title_xpath : (//div[@class="TEXT-BLOCK"]/a)
+  content_xpath : //div[@class="TEXT-BLOCK"]/ul/li
+  categories : general
+  timeout : 7.0
+  shortcut : ai
+
+- name : arxiv
+  engine : arxiv
+  shortcut : arx
+  categories : science
+  timeout : 4.0
+
+- name : asksteem
+  engine : asksteem
+  shortcut : as
+
+- name : base
+  engine : base
+  shortcut : bs
+
+- name : wikipedia
+  engine : wikipedia
+  shortcut : wp
+  base_url : 'https://{language}.wikipedia.org/'
+
+- name : bing
+  engine : bing
+  shortcut : bi
+
+- name : bing images
+  engine : bing_images
+  shortcut : bii
+
+- name : bing news
+  engine : bing_news
+  shortcut : bin
+
+- name : bing videos
+  engine : bing_videos
+  shortcut : biv
+
+- name : bitbucket
+  engine : xpath
+  paging : True
+  search_url : https://bitbucket.org/repo/all/{pageno}?name={query}
+  url_xpath : //article[@class="repo-summary"]//a[@class="repo-link"]/@href
+  title_xpath : //article[@class="repo-summary"]//a[@class="repo-link"]
+  content_xpath : //article[@class="repo-summary"]/p
+  categories : it
+  timeout : 4.0
+  shortcut : bb
+
+- name : ccc-tv
+  engine : xpath
+  paging : False
+  search_url : https://media.ccc.de/search/?q={query}
+  url_xpath : //div[@class="caption"]/h3/a/@href
+  title_xpath : //div[@class="caption"]/h3/a/text()
+  content_xpath : //div[@class="caption"]/h4/@title
+  categories : videos
+  shortcut : c3tv
+
+- name : crossref
+  engine : json_engine
+  paging : True
+  search_url : http://search.crossref.org/dois?q={query}&page={pageno}
+  url_query : doi
+  title_query : title
+  content_query : fullCitation
+  categories : science
+  shortcut : cr
+
+- name : currency
+  engine : currency_convert
+  categories : general
+  shortcut : cc
+
+- name : deezer
+  engine : deezer
+  shortcut : dz
+
+- name : deviantart
+  engine : deviantart
+  shortcut : da
+  timeout: 3.0
+
+- name : ddg definitions
+  engine : duckduckgo_definitions
+  shortcut : ddd
+  weight : 2
+
+- name : digbt
+  engine : digbt
+  shortcut : dbt
+  timeout : 6.0
+
+- name : digg
+  engine : digg
+  shortcut : dg
+
+- name : erowid
+  engine : xpath
+  paging : True
+  first_page_num : 0
+  page_size : 30
+  search_url : https://www.erowid.org/search.php?q={query}&s={pageno}
+  url_xpath : //dl[@class="results-list"]/dt[@class="result-title"]/a/@href
+  title_xpath : //dl[@class="results-list"]/dt[@class="result-title"]/a/text()
+  content_xpath : //dl[@class="results-list"]/dd[@class="result-details"]
+  categories : general
+  shortcut : ew
+
+- name : wikidata
+  engine : wikidata
+  shortcut : wd
+  timeout : 3.0
+  weight : 2
+
+- name : duckduckgo
+  engine : duckduckgo
+  shortcut : ddg
+
+- name : duckduckgo images
+  engine : duckduckgo_images
+  shortcut : ddi
+  timeout: 3.0
+
+- name : etymonline
+  engine : xpath
+  paging : True
+  search_url : http://etymonline.com/?search={query}&p={pageno}
+  url_xpath : //dt/a[1]/@href
+  title_xpath : //dt
+  content_xpath : //dd
+  suggestion_xpath : //a[@class="crossreference"]
+  first_page_num : 0
+  shortcut : et
+
+- name : faroo
+  engine : faroo
+  shortcut : fa
+
+- name : 500px
+  engine : www500px
+  shortcut : px
+
+- name : 1x
+  engine : www1x
+  shortcut : 1x
+
+- name : fdroid
+  engine : fdroid
+  shortcut : fd
+
+- name : findx
+  engine : findx
+  shortcut : fx
+  categories : general
+
+- name : findx images
+  engine : findx
+  shortcut : fxi
+  categories : images
+
+- name : findx videos
+  engine : findx
+  shortcut : fxv
+  categories : videos
+
+- name : flickr
+  categories : images
+  shortcut : fl
+  # You can use the engine using the official stable API, but you need an API key
+  # See : https://www.flickr.com/services/apps/create/
+  #    engine : flickr
+  #    api_key: 'apikey' # required!
+  # Or you can use the html non-stable engine, activated by default
+  engine : flickr_noapi
+
+- name : free software directory
+  engine : mediawiki
+  shortcut : fsd
+  categories : it
+  base_url : https://directory.fsf.org/
+  number_of_results : 5
+  # what part of a page matches the query string: title, text, nearmatch
+  # title - query matches title, text - query matches the text of page, nearmatch - nearmatch in title
+  search_type : title
+  timeout : 5.0
+
+- name : frinkiac
+  engine : frinkiac
+  shortcut : frk
+
+- name : genius
+  engine : genius
+  shortcut : gen
+
+- name : gigablast
+  engine : gigablast
+  shortcut : gb
+  timeout : 3.0
+
+- name : gitlab
+  engine : json_engine
+  paging : True
+  search_url : https://gitlab.com/api/v4/projects?search={query}&page={pageno}
+  url_query : web_url
+  title_query : name_with_namespace
+  content_query : description
+  page_size : 20
+  categories : it
+  shortcut : gl
+  timeout : 10.0
+
+- name : github
+  engine : github
+  shortcut : gh
+
+- name : google
+  engine : google
+  shortcut : go
+
+- name : google images
+  engine : google_images
+  shortcut : goi
+
+- name : google news
+  engine : google_news
+  shortcut : gon
+
+- name : google videos
+  engine : google_videos
+  shortcut : gov
+
+- name : google scholar
+  engine : xpath
+  paging : True
+  search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1
+  results_xpath : //div[@class="gs_r"]/div[@class="gs_ri"]
+  url_xpath : .//h3/a/@href
+  title_xpath : .//h3/a
+  content_xpath : .//div[@class="gs_rs"]
+  suggestion_xpath : //div[@id="gs_qsuggest"]/ul/li
+  page_size : 10
+  first_page_num : 0
+  categories : science
+  shortcut : gos
+
+- name : google play apps
+  engine        : xpath
+  search_url    : https://play.google.com/store/search?q={query}&c=apps
+  url_xpath     : //a[@class="title"]/@href
+  title_xpath   : //a[@class="title"]
+  content_xpath : //a[@class="subtitle"]
+  categories : files
+  shortcut : gpa
+
+- name : google play movies
+  engine        : xpath
+  search_url    : https://play.google.com/store/search?q={query}&c=movies
+  url_xpath     : //a[@class="title"]/@href
+  title_xpath   : //a[@class="title"]/@title
+  content_xpath : //a[contains(@class, "subtitle")]
+  categories : videos
+  shortcut : gpm
+
+- name : google play music
+  engine        : xpath
+  search_url    : https://play.google.com/store/search?q={query}&c=music
+  url_xpath     : //a[@class="title"]/@href
+  title_xpath   : //a[@class="title"]
+  content_xpath : //a[@class="subtitle"]
+  categories : music
+  shortcut : gps
+
+- name : geektimes
+  engine : xpath
+  paging : True
+  search_url : https://geektimes.ru/search/page{pageno}/?q={query}
+  url_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]/@href
+  title_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]
+  content_xpath : //article[contains(@class, "post")]//div[contains(@class, "post__text")]
+  categories : it
+  timeout : 4.0
+  shortcut : gt
+
+- name : habrahabr
+  engine : xpath
+  paging : True
+  search_url : https://habrahabr.ru/search/page{pageno}/?q={query}
+  url_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]/@href
+  title_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]
+  content_xpath : //article[contains(@class, "post")]//div[contains(@class, "post__text")]
+  categories : it
+  timeout : 4.0
+  shortcut : habr
+
+- name : hoogle
+  engine : json_engine
+  paging : True
+  search_url : https://www.haskell.org/hoogle/?mode=json&hoogle={query}&start={pageno}
+  results_query : results
+  url_query : location
+  title_query : self
+  content_query : docs
+  page_size : 20
+  categories : it
+  shortcut : ho
+
+- name : ina
+  engine : ina
+  shortcut : in
+  timeout : 6.0
+
+- name: kickass
+  engine : kickass
+  shortcut : kc
+  timeout : 4.0
+
+- name : library genesis
+  engine : xpath
+  search_url : http://libgen.io/search.php?req={query}
+  url_xpath : //a[contains(@href,"bookfi.net")]/@href
+  title_xpath : //a[contains(@href,"book/")]/text()[1]
+  content_xpath : //td/a[1][contains(@href,"=author")]/text()
+  categories : general
+  timeout : 7.0
+  shortcut : lg
+
+- name : lobste.rs
+  engine : xpath
+  search_url : https://lobste.rs/search?utf8=%E2%9C%93&q={query}&what=stories&order=relevance
+  results_xpath : //li[contains(@class, "story")]
+  url_xpath : .//span[@class="link"]/a/@href
+  title_xpath : .//span[@class="link"]/a
+  content_xpath : .//a[@class="domain"]
+  categories : it
+  shortcut : lo
+
+- name : microsoft academic
+  engine : microsoft_academic
+  categories : science
+  shortcut : ma
+
+- name : mixcloud
+  engine : mixcloud
+  shortcut : mc
+
+- name : nyaa
+  engine : nyaa
+  shortcut : nt
+
+- name : openairedatasets
+  engine : json_engine
+  paging : True
+  search_url : http://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
+  results_query : response/results/result
+  url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
+  title_query : metadata/oaf:entity/oaf:result/title/$
+  content_query : metadata/oaf:entity/oaf:result/description/$
+  categories : science
+  shortcut : oad
+  timeout: 5.0
+
+- name : openairepublications
+  engine : json_engine
+  paging : True
+  search_url : http://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
+  results_query : response/results/result
+  url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
+  title_query : metadata/oaf:entity/oaf:result/title/$
+  content_query : metadata/oaf:entity/oaf:result/description/$
+  categories : science
+  shortcut : oap
+  timeout: 5.0
+
+- name : openstreetmap
+  engine : openstreetmap
+  shortcut : osm
+
+- name : openrepos
+  engine : xpath
+  paging : True
+  search_url : https://openrepos.net/search/node/{query}?page={pageno}
+  url_xpath : //li[@class="search-result"]//h3[@class="title"]/a/@href
+  title_xpath : //li[@class="search-result"]//h3[@class="title"]/a
+  content_xpath : //li[@class="search-result"]//div[@class="search-snippet-info"]//p[@class="search-snippet"]
+  categories : files
+  timeout : 4.0
+  shortcut : or
+
+- name : pdbe
+  engine : pdbe
+  shortcut : pdb
+  # Hide obsolete PDB entries.
+  # Default is not to hide obsolete structures
+  #    hide_obsolete : False
+
+- name : photon
+  engine : photon
+  shortcut : ph
+
+- name : piratebay
+  engine : piratebay
+  shortcut : tpb
+  url: https://pirateproxy.red/
+  timeout : 3.0
+
+- name : pubmed
+  engine : pubmed
+  shortcut : pub
+  categories: science
+  timeout : 3.0
+
+- name : qwant
+  engine : qwant
+  shortcut : qw
+  categories : general
+
+- name : qwant images
+  engine : qwant
+  shortcut : qwi
+  categories : images
+
+- name : qwant news
+  engine : qwant
+  shortcut : qwn
+  categories : news
+
+- name : qwant social
+  engine : qwant
+  shortcut : qws
+  categories : social media
+
+- name : reddit
+  engine : reddit
+  shortcut : re
+  page_size : 25
+  timeout : 10.0
+
+- name : scanr structures
+  shortcut: scs
+  engine : scanr_structures
+
+- name : soundcloud
+  engine : soundcloud
+  shortcut : sc
+
+- name : stackoverflow
+  engine : stackoverflow
+  shortcut : st
+
+- name : searchcode doc
+  engine : searchcode_doc
+  shortcut : scd
+
+- name : searchcode code
+  engine : searchcode_code
+  shortcut : scc
+
+- name : framalibre
+  engine : framalibre
+  shortcut : frl
+
+#  - name : searx
+#    engine : searx_engine
+#    shortcut : se
+#    instance_urls :
+#        - http://127.0.0.1:8888/
+#        - ...
+
+- name : semantic scholar
+  engine : xpath
+  paging : True
+  search_url : https://www.semanticscholar.org/search?q={query}&sort=relevance&page={pageno}&ae=false
+  results_xpath : //article
+  url_xpath : .//div[@class="search-result-title"]/a/@href
+  title_xpath : .//div[@class="search-result-title"]/a
+  content_xpath : .//div[@class="search-result-abstract"]
+  shortcut : se
+  categories : science
+
+- name : spotify
+  engine : spotify
+  shortcut : stf
+
+- name : subtitleseeker
+  engine : subtitleseeker
+  shortcut : ss
+  # The language is an option. You can put any language written in english
+  # Examples : English, French, German, Hungarian, Chinese...
+  #    language : English
+
+- name : startpage
+  engine : startpage
+  shortcut : sp
+  timeout : 6.0
+
+- name : ixquick
+  engine : startpage
+  base_url : 'https://www.ixquick.eu/'
+  search_url : 'https://www.ixquick.eu/do/search'
+  shortcut : iq
+  timeout : 6.0
+
+- name : swisscows
+  engine : swisscows
+  shortcut : sw
+
+- name : tokyotoshokan
+  engine : tokyotoshokan
+  shortcut : tt
+  timeout : 6.0
+
+- name : torrentz
+  engine : torrentz
+  shortcut : tor
+  url: https://torrentz2.eu/
+  timeout : 3.0
+
+- name : twitter
+  engine : twitter
+  shortcut : tw
+
+# maybe in a fun category
+#  - name : uncyclopedia
+#    engine : mediawiki
+#    shortcut : unc
+#    base_url : https://uncyclopedia.wikia.com/
+#    number_of_results : 5
+
+# tmp suspended - too slow, too many errors
+#  - name : urbandictionary
+#    engine        : xpath
+#    search_url    : http://www.urbandictionary.com/define.php?term={query}
+#    url_xpath     : //*[@class="word"]/@href
+#    title_xpath   : //*[@class="def-header"]
+#    content_xpath : //*[@class="meaning"]
+#    shortcut : ud
+
+- name : yahoo
+  engine : yahoo
+  shortcut : yh
+
+- name : yandex
+  engine : yandex
+  shortcut : yn
+
+- name : yahoo news
+  engine : yahoo_news
+  shortcut : yhn
+
+- name : youtube
+  shortcut : yt
+  # You can use the engine using the official stable API, but you need an API key
+  # See : https://console.developers.google.com/project
+  #    engine : youtube_api
+  #    api_key: 'apikey' # required!
+  # Or you can use the html non-stable engine, activated by default
+  engine : youtube_noapi
+
+- name : dailymotion
+  engine : dailymotion
+  shortcut : dm
+
+- name : vimeo
+  engine : vimeo
+  shortcut : vm
+
+- name : wolframalpha
+  shortcut : wa
+  # You can use the engine using the official stable API, but you need an API key
+  # See : http://products.wolframalpha.com/api/
+  # engine : wolframalpha_api
+  # api_key: '' # required!
+  engine : wolframalpha_noapi
+  timeout: 6.0
+  categories : science
+
+- name : seedpeer
+  engine : seedpeer
+  shortcut: speu
+  categories: files, music, videos
+
+- name : dictzone
+  engine : dictzone
+  shortcut : dc
+
+- name : mymemory translated
+  engine : translated
+  shortcut : tl
+  timeout : 5.0
+  # You can use without an API key, but you are limited to 1000 words/day
+  # See : http://mymemory.translated.net/doc/usagelimits.php
+  # api_key : ''
+
+- name : voat
+  engine: xpath
+  shortcut: vo
+  categories: social media
+  search_url : https://searchvoat.co/?t={query}
+  url_xpath : //div[@class="entry"]/p/a[@class="title"]/@href
+  title_xpath : //div[@class="entry"]/p/a[@class="title"]
+  content_xpath : //div[@class="entry"]/p/span[@class="domain"]
+  timeout : 10.0
+
+- name : 1337x
+  engine : 1337x
+  shortcut : 1337x
+
+#  - name : yacy
+#    engine : yacy
+#    shortcut : ya
+#    base_url : 'http://localhost:8090'
+#    number_of_results : 5
+#    timeout : 3.0
+
+# Doku engine lets you access to any Doku wiki instance:
+# A public one or a privete/corporate one.
+#  - name : ubuntuwiki
+#    engine : doku
+#    shortcut : uw
+#    base_url : 'http://doc.ubuntu-fr.org'

searx/locales.yml

+  en : English
+  ar : العَرَبِيَّة (Arabic)
+  bg : Български (Bulgarian)
+  cs : Čeština (Czech)
+  da : Dansk (Danish)
+  de : Deutsch (German)
+  el_GR : Ελληνικά (Greek_Greece)
+  eo : Esperanto (Esperanto)
+  es : Español (Spanish)
+  fi : Suomi (Finnish)
+  fil : Wikang Filipino (Filipino)
+  fr : Français (French)
+  he : עברית (Hebrew)
+  hr : Hrvatski (Croatian)
+  hu : Magyar (Hungarian)
+  it : Italiano (Italian)
+  ja : 日本語 (Japanese)
+  nl : Nederlands (Dutch)
+  pl : Polszczyzna (Polish)
+  pt : Português (Portuguese)
+  pt_BR : Português (Portuguese_Brazil)
+  ro : Română (Romanian)
+  ru : Русский (Russian)
+  sk : Slovenčina (Slovak)
+  sl : Slovenski (Slovene)
+  sr : српски (Serbian)
+  sv : Svenska (Swedish)
+  tr : Türkçe (Turkish)
+  uk : українська мова (Ukrainian)
+  zh : 中文 (Chinese)
+  zh_TW : 國語 (Taiwanese Mandarin)

searx/plugins/oa_doi_rewrite.py

 default_on = False
 preference_section = 'privacy'
 
-doi_resolvers = settings['doi_resolvers']
+doi_resolvers = settings['doi']['resolvers']
 
 
 def extract_doi(url):
 
 
 def get_doi_resolver(args, preference_doi_resolver):
-    doi_resolvers = settings['doi_resolvers']
+    doi_resolvers = settings['doi']['resolvers']
     doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0]
     if doi_resolver not in doi_resolvers:
-        doi_resolvers = settings['default_doi_resolver']
+        doi_resolver = settings['doi']['default']
     return doi_resolver
 
 
 def on_result(request, search, result):
     doi = extract_doi(result['parsed_url'])
     if doi and len(doi) < 50:
-        for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):
+        for suffix in ('/', '.pdf', '.full', '/pdf', '/full', '/meta', '/abstract'):
             if doi.endswith(suffix):
                 doi = doi[:-len(suffix)]
-        result['url'] = get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')) + doi
+        base_url = doi_resolvers[get_doi_resolver(request.args, request.preferences.get_value('doi_resolver'))]
+        result['url'] = base_url + doi
         result['parsed_url'] = urlparse(result['url'])
     return True

searx/preferences.py

 LANGUAGE_CODES = [l[0] for l in languages]
 DISABLED = 0
 ENABLED = 1
-DOI_RESOLVERS = list(settings['doi_resolvers'])
+DOI_RESOLVERS = list(settings['doi']['resolvers'])
 
 
 class MissingArgumentException(Exception):

searx/settings.yml

     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
     autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
     language : "en-US"
+    engines_path: "" # engines.yml path - leave it blank if you don't change
+    include_engines_path: "" # user defined engines file path - leave it blank if you don't change
+    engines: # enabled engines with additional settings (timeout for example)
+      - name: arch linux wiki
+      #- name: archive is
+      - name: arxiv
+      - name: asksteem
+      - name: base
+      - name: wikipedia
+      - name: bing
+      - name: bing images
+      - name: bing news
+      - name: bing videos
+      #- name: bitbucket
+      #- name: ccc-tv
+      - name: crossref
+      - name: currency
+      - name: deezer
+      - name: deviantart
+      #- name: ddg definitions
+      #- name: digbt
+      - name: digg
+      #- name: erowid
+      - name: wikidata
+      #- name: duckduckgo
+      #- name: duckduckgo images
+      #- name: etymonline
+      #- name: faroo
+      - name: 500px
+      #- name: 1x
+      #- name: fdroid
+      #- name: findx
+      #- name: findx images
+      #- name: findx videos
+      - name: flickr
+      #- name: free software directory
+      #- name: frinkiac
+      - name: genius
+      #- name: gigablast
+      #- name: gitlab
+      - name: github
+      - name: google
+      - name: google images
+      - name: google news
+      - name: google videos
+      - name: google scholar
+      #- name: google play apps
+      #- name: google play movies
+      #- name: google play music
+      #- name: geektimes
+      #- name: habrahabr
+      - name: hoogle
+      #- name: ina
+      #- name: kickass
+      #- name: library genesis
+      - name: lobste.rs
+      - name: microsoft academic
+      - name: mixcloud
+      #- name: nyaa
+      - name: openairedatasets
+      - name: openairepublications
+      - name: openstreetmap
+      #- name: openrepos
+      - name: pdbe
+      - name: photon
+      - name: piratebay
+      - name: pubmed
+      #- name: qwant
+      - name: qwant images
+      - name: qwant news
+      - name: qwant social
+      #- name: reddit
+      #- name: scanr structures
+      - name: soundcloud
+      - name: stackoverflow
+      - name: searchcode doc
+      #- name: searchcode code
+      #- name: framalibre
+      - name: semantic scholar
+      - name: spotify
+      - name: subtitleseeker
+      #- name: startpage
+      #- name: ixquick
+      #- name: swisscows
+      #- name: tokyotoshokan
+      - name: torrentz
+      - name: twitter
+      #- name: yahoo
+      #- name: yandex
+      - name: yahoo news
+      - name: youtube
+      - name: dailymotion
+      - name: vimeo
+      - name: wolframalpha
+      #- name: seedpeer
+      - name: dictzone
+      #- name: mymemory translated
+      #- name: voat
+      #- name: 1337x
 
 server:
     port : 8888
 #    source_ips:
 #        - 1.1.1.1
 #        - 1.1.1.2
-
-engines:
-  - name : arch linux wiki
-    engine : archlinux
-    shortcut : al
-
-  - name : archive is
-    engine : xpath
-    search_url : https://archive.is/{query}
-    url_xpath : (//div[@class="TEXT-BLOCK"]/a)/@href
-    title_xpath : (//div[@class="TEXT-BLOCK"]/a)
-    content_xpath : //div[@class="TEXT-BLOCK"]/ul/li
-    categories : general
-    timeout : 7.0
-    disabled : True
-    shortcut : ai
-
-  - name : arxiv
-    engine : arxiv
-    shortcut : arx
-    categories : science
-    timeout : 4.0
-
-  - name : asksteem
-    engine : asksteem
-    shortcut : as
-
-  - name : base
-    engine : base
-    shortcut : bs
-
-  - name : wikipedia
-    engine : wikipedia
-    shortcut : wp
-    base_url : 'https://{language}.wikipedia.org/'
-
-  - name : bing
-    engine : bing
-    shortcut : bi
-
-  - name : bing images
-    engine : bing_images
-    shortcut : bii
-
-  - name : bing news
-    engine : bing_news
-    shortcut : bin
-
-  - name : bing videos
-    engine : bing_videos
-    shortcut : biv
-
-  - name : bitbucket
-    engine : xpath
-    paging : True
-    search_url : https://bitbucket.org/repo/all/{pageno}?name={query}
-    url_xpath : //article[@class="repo-summary"]//a[@class="repo-link"]/@href
-    title_xpath : //article[@class="repo-summary"]//a[@class="repo-link"]
-    content_xpath : //article[@class="repo-summary"]/p
-    categories : it
-    timeout : 4.0
-    disabled : True
-    shortcut : bb
-
-  - name : ccc-tv
-    engine : xpath
-    paging : False
-    search_url : https://media.ccc.de/search/?q={query}
-    url_xpath : //div[@class="caption"]/h3/a/@href
-    title_xpath : //div[@class="caption"]/h3/a/text()
-    content_xpath : //div[@class="caption"]/h4/@title
-    categories : videos
-    disabled : True
-    shortcut : c3tv
-
-  - name : crossref
-    engine : json_engine
-    paging : True
-    search_url : http://search.crossref.org/dois?q={query}&page={pageno}
-    url_query : doi
-    title_query : title
-    content_query : fullCitation
-    categories : science
-    shortcut : cr
-
-  - name : currency
-    engine : currency_convert
-    categories : general
-    shortcut : cc
-
-  - name : deezer
-    engine : deezer
-    shortcut : dz
-
-  - name : deviantart
-    engine : deviantart
-    shortcut : da
-    timeout: 3.0
-
-  - name : ddg definitions
-    engine : duckduckgo_definitions
-    shortcut : ddd
-    weight : 2
-    disabled : True
-
-  - name : digbt
-    engine : digbt
-    shortcut : dbt
-    timeout : 6.0
-    disabled : True
-
-  - name : digg
-    engine : digg
-    shortcut : dg
-
-  - name : erowid
-    engine : xpath
-    paging : True
-    first_page_num : 0
-    page_size : 30
-    search_url : https://www.erowid.org/search.php?q={query}&s={pageno}
-    url_xpath : //dl[@class="results-list"]/dt[@class="result-title"]/a/@href
-    title_xpath : //dl[@class="results-list"]/dt[@class="result-title"]/a/text()
-    content_xpath : //dl[@class="results-list"]/dd[@class="result-details"]
-    categories : general
-    shortcut : ew
-    disabled : True
-
-  - name : wikidata
-    engine : wikidata
-    shortcut : wd
-    timeout : 3.0
-    weight : 2
-
-  - name : duckduckgo
-    engine : duckduckgo
-    shortcut : ddg
-    disabled : True
-
-  - name : duckduckgo images
-    engine : duckduckgo_images
-    shortcut : ddi
-    timeout: 3.0
-    disabled : True
-
-  - name : etymonline
-    engine : xpath
-    paging : True
-    search_url : http://etymonline.com/?search={query}&p={pageno}
-    url_xpath : //dt/a[1]/@href
-    title_xpath : //dt
-    content_xpath : //dd
-    suggestion_xpath : //a[@class="crossreference"]
-    first_page_num : 0
-    shortcut : et
-    disabled : True
-
-  - name : faroo
-    engine : faroo
-    shortcut : fa
-    disabled : True
-
-  - name : 500px
-    engine : www500px
-    shortcut : px
-
-  - name : 1x
-    engine : www1x
-    shortcut : 1x
-    disabled : True
-
-  - name : fdroid
-    engine : fdroid
-    shortcut : fd
-    disabled : True
-
-  - name : findx
-    engine : findx
-    shortcut : fx
-    categories : general
-    disabled : True
-
-  - name : findx images
-    engine : findx
-    shortcut : fxi
-    categories : images
-    disabled : True
-
-  - name : findx videos
-    engine : findx
-    shortcut : fxv
-    categories : videos
-    disabled : True
-
-  - name : flickr
-    categories : images
-    shortcut : fl
-# You can use the engine using the official stable API, but you need an API key
-# See : https://www.flickr.com/services/apps/create/
-#    engine : flickr
-#    api_key: 'apikey' # required!
-# Or you can use the html non-stable engine, activated by default
-    engine : flickr_noapi
-
-  - name : free software directory
-    engine : mediawiki
-    shortcut : fsd
-    categories : it
-    base_url : https://directory.fsf.org/
-    number_of_results : 5
-# what part of a page matches the query string: title, text, nearmatch
-# title - query matches title, text - query matches the text of page, nearmatch - nearmatch in title
-    search_type : title
-    timeout : 5.0
-    disabled : True
-
-  - name : frinkiac
-    engine : frinkiac
-    shortcut : frk
-    disabled : True
-
-  - name : genius
-    engine : genius
-    shortcut : gen
-
-  - name : gigablast
-    engine : gigablast
-    shortcut : gb
-    timeout : 3.0
-    disabled: True
-
-  - name : gitlab
-    engine : json_engine
-    paging : True
-    search_url : https://gitlab.com/api/v4/projects?search={query}&page={pageno}
-    url_query : web_url
-    title_query : name_with_namespace
-    content_query : description
-    page_size : 20
-    categories : it
-    shortcut : gl
-    timeout : 10.0
-    disabled : True
-
-  - name : github
-    engine : github
-    shortcut : gh
-
-  - name : google
-    engine : google
-    shortcut : go
-
-  - name : google images
-    engine : google_images
-    shortcut : goi
-
-  - name : google news
-    engine : google_news
-    shortcut : gon
-
-  - name : google videos
-    engine : google_videos
-    shortcut : gov
-
-  - name : google scholar
-    engine : xpath
-    paging : True
-    search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1
-    results_xpath : //div[@class="gs_r"]/div[@class="gs_ri"]
-    url_xpath : .//h3/a/@href
-    title_xpath : .//h3/a
-    content_xpath : .//div[@class="gs_rs"]
-    suggestion_xpath : //div[@id="gs_qsuggest"]/ul/li
-    page_size : 10
-    first_page_num : 0
-    categories : science
-    shortcut : gos
-
-  - name : google play apps
-    engine        : xpath
-    search_url    : https://play.google.com/store/search?q={query}&c=apps
-    url_xpath     : //a[@class="title"]/@href
-    title_xpath   : //a[@class="title"]
-    content_xpath : //a[@class="subtitle"]
-    categories : files
-    shortcut : gpa
-    disabled : True
-
-  - name : google play movies
-    engine        : xpath
-    search_url    : https://play.google.com/store/search?q={query}&c=movies
-    url_xpath     : //a[@class="title"]/@href
-    title_xpath   : //a[@class="title"]/@title
-    content_xpath : //a[contains(@class, "subtitle")]
-    categories : videos
-    shortcut : gpm
-    disabled : True
-
-  - name : google play music
-    engine        : xpath
-    search_url    : https://play.google.com/store/search?q={query}&c=music
-    url_xpath     : //a[@class="title"]/@href
-    title_xpath   : //a[@class="title"]
-    content_xpath : //a[@class="subtitle"]
-    categories : music
-    shortcut : gps
-    disabled : True
-
-  - name : geektimes
-    engine : xpath
-    paging : True
-    search_url : https://geektimes.ru/search/page{pageno}/?q={query}
-    url_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]/@href
-    title_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]
-    content_xpath : //article[contains(@class, "post")]//div[contains(@class, "post__text")]
-    categories : it
-    timeout : 4.0
-    disabled : True
-    shortcut : gt
-
-  - name : habrahabr
-    engine : xpath
-    paging : True
-    search_url : https://habrahabr.ru/search/page{pageno}/?q={query}
-    url_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]/@href
-    title_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]
-    content_xpath : //article[contains(@class, "post")]//div[contains(@class, "post__text")]
-    categories : it
-    timeout : 4.0
-    disabled : True
-    shortcut : habr
-
-  - name : hoogle
-    engine : json_engine
-    paging : True
-    search_url : https://www.haskell.org/hoogle/?mode=json&hoogle={query}&start={pageno}
-    results_query : results
-    url_query : location
-    title_query : self
-    content_query : docs
-    page_size : 20
-    categories : it
-    shortcut : ho
-
-  - name : ina
-    engine : ina
-    shortcut : in
-    timeout : 6.0
-    disabled : True
-
-  - name: kickass
-    engine : kickass
-    shortcut : kc
-    timeout : 4.0
-    disabled : True
-
-  - name : library genesis
-    engine : xpath
-    search_url : http://libgen.io/search.php?req={query}
-    url_xpath : //a[contains(@href,"bookfi.net")]/@href
-    title_xpath : //a[contains(@href,"book/")]/text()[1]
-    content_xpath : //td/a[1][contains(@href,"=author")]/text()
-    categories : general
-    timeout : 7.0
-    disabled : True
-    shortcut : lg
-
-  - name : lobste.rs
-    engine : xpath
-    search_url : https://lobste.rs/search?utf8=%E2%9C%93&q={query}&what=stories&order=relevance
-    results_xpath : //li[contains(@class, "story")]
-    url_xpath : .//span[@class="link"]/a/@href
-    title_xpath : .//span[@class="link"]/a
-    content_xpath : .//a[@class="domain"]
-    categories : it
-    shortcut : lo
-
-  - name : microsoft academic
-    engine : microsoft_academic
-    categories : science
-    shortcut : ma
-
-  - name : mixcloud
-    engine : mixcloud
-    shortcut : mc
-
-  - name : nyaa
-    engine : nyaa
-    shortcut : nt
-    disabled : True
-
-  - name : openairedatasets
-    engine : json_engine
-    paging : True
-    search_url : http://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
-    results_query : response/results/result
-    url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
-    title_query : metadata/oaf:entity/oaf:result/title/$
-    content_query : metadata/oaf:entity/oaf:result/description/$
-    categories : science
-    shortcut : oad
-    timeout: 5.0
-
-  - name : openairepublications
-    engine : json_engine
-    paging : True
-    search_url : http://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
-    results_query : response/results/result
-    url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
-    title_query : metadata/oaf:entity/oaf:result/title/$
-    content_query : metadata/oaf:entity/oaf:result/description/$
-    categories : science
-    shortcut : oap
-    timeout: 5.0
-
-  - name : openstreetmap
-    engine : openstreetmap
-    shortcut : osm
-
-  - name : openrepos
-    engine : xpath
-    paging : True
-    search_url : https://openrepos.net/search/node/{query}?page={pageno}
-    url_xpath : //li[@class="search-result"]//h3[@class="title"]/a/@href
-    title_xpath : //li[@class="search-result"]//h3[@class="title"]/a
-    content_xpath : //li[@class="search-result"]//div[@class="search-snippet-info"]//p[@class="search-snippet"]
-    categories : files
-    timeout : 4.0
-    disabled : True
-    shortcut : or
-
-  - name : pdbe
-    engine : pdbe
-    shortcut : pdb
-# Hide obsolete PDB entries.
-# Default is not to hide obsolete structures
-#    hide_obsolete : False
-
-  - name : photon
-    engine : photon
-    shortcut : ph
-
-  - name : piratebay
-    engine : piratebay
-    shortcut : tpb
-    url: https://pirateproxy.red/
-    timeout : 3.0
-
-  - name : pubmed
-    engine : pubmed
-    shortcut : pub
-    categories: science
-    timeout : 3.0
-
-  - name : qwant
-    engine : qwant
-    shortcut : qw
-    categories : general
-    disabled : True
-
-  - name : qwant images
-    engine : qwant
-    shortcut : qwi
-    categories : images
-
-  - name : qwant news
-    engine : qwant
-    shortcut : qwn
-    categories : news
-
-  - name : qwant social
-    engine : qwant
-    shortcut : qws
-    categories : social media
-
-  - name : reddit
-    engine : reddit
-    shortcut : re
-    page_size : 25
-    timeout : 10.0
-    disabled : True
-
-  - name : scanr structures
-    shortcut: scs
-    engine : scanr_structures
-    disabled : True
-
-  - name : soundcloud
-    engine : soundcloud
-    shortcut : sc
-
-  - name : stackoverflow
-    engine : stackoverflow
-    shortcut : st
-
-  - name : searchcode doc
-    engine : searchcode_doc
-    shortcut : scd
-
-  - name : searchcode code
-    engine : searchcode_code
-    shortcut : scc
-    disabled : True
-
-  - name : framalibre
-    engine : framalibre
-    shortcut : frl
-    disabled : True
-
-#  - name : searx
-#    engine : searx_engine
-#    shortcut : se
-#    instance_urls :
-#        - http://127.0.0.1:8888/
-#        - ...
-#    disabled : True
-
-  - name : semantic scholar
-    engine : xpath
-    paging : True
-    search_url : https://www.semanticscholar.org/search?q={query}&sort=relevance&page={pageno}&ae=false
-    results_xpath : //article
-    url_xpath : .//div[@class="search-result-title"]/a/@href
-    title_xpath : .//div[@class="search-result-title"]/a
-    content_xpath : .//div[@class="search-result-abstract"]
-    shortcut : se
-    categories : science
-
-  - name : spotify
-    engine : spotify
-    shortcut : stf
-
-  - name : subtitleseeker
-    engine : subtitleseeker
-    shortcut : ss
-# The language is an option. You can put any language written in english
-# Examples : English, French, German, Hungarian, Chinese...
-#    language : English
-
-  - name : startpage
-    engine : startpage
-    shortcut : sp
-    timeout : 6.0
-    disabled : True
-
-  - name : ixquick
-    engine : startpage
-    base_url : 'https://www.ixquick.eu/'
-    search_url : 'https://www.ixquick.eu/do/search'
-    shortcut : iq
-    timeout : 6.0
-    disabled : True
-
-  - name : swisscows
-    engine : swisscows
-    shortcut : sw
-    disabled : True
-
-  - name : tokyotoshokan
-    engine : tokyotoshokan
-    shortcut : tt
-    timeout : 6.0
-    disabled : True
-
-  - name : torrentz
-    engine : torrentz
-    shortcut : tor
-    url: https://torrentz2.eu/
-    timeout : 3.0
-
-  - name : twitter
-    engine : twitter
-    shortcut : tw
-
-# maybe in a fun category
-#  - name : uncyclopedia
-#    engine : mediawiki
-#    shortcut : unc
-#    base_url : https://uncyclopedia.wikia.com/
-#    number_of_results : 5
-
-# tmp suspended - too slow, too many errors
-#  - name : urbandictionary
-#    engine        : xpath
-#    search_url    : http://www.urbandictionary.com/define.php?term={query}
-#    url_xpath     : //*[@class="word"]/@href
-#    title_xpath   : //*[@class="def-header"]
-#    content_xpath : //*[@class="meaning"]
-#    shortcut : ud
-
-  - name : yahoo
-    engine : yahoo
-    shortcut : yh
-    disabled : True
-
-  - name : yandex
-    engine : yandex
-    shortcut : yn
-    disabled : True
-
-  - name : yahoo news
-    engine : yahoo_news
-    shortcut : yhn
-
-  - name : youtube
-    shortcut : yt
-    # You can use the engine using the official stable API, but you need an API key
-    # See : https://console.developers.google.com/project
-    #    engine : youtube_api
-    #    api_key: 'apikey' # required!
-    # Or you can use the html non-stable engine, activated by default
-    engine : youtube_noapi
-
-  - name : dailymotion
-    engine : dailymotion
-    shortcut : dm
-
-  - name : vimeo
-    engine : vimeo
-    shortcut : vm
-
-  - name : wolframalpha
-    shortcut : wa
-    # You can use the engine using the official stable API, but you need an API key
-    # See : http://products.wolframalpha.com/api/
-    # engine : wolframalpha_api
-    # api_key: '' # required!
-    engine : wolframalpha_noapi
-    timeout: 6.0
-    categories : science
-
-  - name : seedpeer
-    engine : seedpeer
-    shortcut: speu
-    categories: files, music, videos
-    disabled: True
-
-  - name : dictzone
-    engine : dictzone
-    shortcut : dc
-
-  - name : mymemory translated
-    engine : translated
-    shortcut : tl
-    timeout : 5.0
-    disabled : True
-    # You can use without an API key, but you are limited to 1000 words/day
-    # See : http://mymemory.translated.net/doc/usagelimits.php
-    # api_key : ''
-
-  - name : voat
-    engine: xpath
-    shortcut: vo
-    categories: social media
-    search_url : https://searchvoat.co/?t={query}
-    url_xpath : //div[@class="entry"]/p/a[@class="title"]/@href
-    title_xpath : //div[@class="entry"]/p/a[@class="title"]
-    content_xpath : //div[@class="entry"]/p/span[@class="domain"]
-    timeout : 10.0
-    disabled : True
-
-  - name : 1337x
-    engine : 1337x
-    shortcut : 1337x
-    disabled : True
-
-#  - name : yacy
-#    engine : yacy
-#    shortcut : ya
-#    base_url : 'http://localhost:8090'
-#    number_of_results : 5
-#    timeout : 3.0
-
-# Doku engine lets you access to any Doku wiki instance:
-# A public one or a privete/corporate one.
-#  - name : ubuntuwiki
-#    engine : doku
-#    shortcut : uw
-#    base_url : 'http://doc.ubuntu-fr.org'
-
-locales:
-    en : English
-    ar : العَرَبِيَّة (Arabic)
-    bg : Български (Bulgarian)
-    cs : Čeština (Czech)
-    da : Dansk (Danish)
-    de : Deutsch (German)
-    el_GR : Ελληνικά (Greek_Greece)
-    eo : Esperanto (Esperanto)
-    es : Español (Spanish)
-    fi : Suomi (Finnish)
-    fil : Wikang Filipino (Filipino)
-    fr : Français (French)
-    he : עברית (Hebrew)
-    hr : Hrvatski (Croatian)
-    hu : Magyar (Hungarian)
-    it : Italiano (Italian)
-    ja : 日本語 (Japanese)
-    nl : Nederlands (Dutch)
-    pl : Polszczyzna (Polish)
-    pt : Português (Portuguese)
-    pt_BR : Português (Portuguese_Brazil)
-    ro : Română (Romanian)
-    ru : Русский (Russian)
-    sk : Slovenčina (Slovak)
-    sl : Slovenski (Slovene)
-    sr : српски (Serbian)
-    sv : Svenska (Swedish)
-    tr : Türkçe (Turkish)
-    uk : українська мова (Ukrainian)
-    zh : 中文 (Chinese)
-    zh_TW : 國語 (Taiwanese Mandarin)
-
-doi_resolvers :
-  oadoi.org : 'https://oadoi.org/'
-  doi.org : 'https://doi.org/'
-  doai.io  : 'http://doai.io/'
-
-default_doi_resolver : 'oadoi.org'

searx/webapp.py

                   shortcuts={y: x for x, y in engine_shortcuts.items()},
                   themes=themes,
                   plugins=plugins,
-                  doi_resolvers=settings['doi_resolvers'],
+                  doi_resolvers=settings['doi']['resolvers'],
                   current_doi_resolver=get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')),
                   allowed_plugins=allowed_plugins,
                   theme=get_current_theme_name(),
                     'safe_search': settings['search']['safe_search'],
                     'default_theme': settings['ui']['default_theme'],
                     'version': VERSION_STRING,
-                    'doi_resolvers': [r for r in settings['doi_resolvers']],
-                    'default_doi_resolver': settings['default_doi_resolver'],
+                    'doi_resolvers': [r for r in settings['doi']['resolvers']],
+                    'default_doi_resolver': settings['doi']['default'],
                     })