diff options
| author | asciimoo <asciimoo@gmail.com> | 2014-01-19 00:17:02 +0100 |
|---|---|---|
| committer | asciimoo <asciimoo@gmail.com> | 2014-01-19 00:17:02 +0100 |
| commit | 3afdd1d9941527e23cd7c05d2c15dd24a32de834 (patch) | |
| tree | 4bc85cba1b0784e1528ef0d235562201e4f0c437 /searx/webapp.py | |
| parent | 39ebe1d5193bf62340bc101d51cab77df3c06f7e (diff) | |
[enh] settings unification - new dependency: pyyaml
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index 15ab17d15..de68d73e6 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -41,7 +41,7 @@ from searx.utils import highlight_content, html_to_text app = Flask(__name__) -app.secret_key = settings.secret_key +app.secret_key = settings['server']['secret_key'] opensearch_xml = '''<?xml version="1.0" encoding="utf-8"?> @@ -58,8 +58,8 @@ opensearch_xml = '''<?xml version="1.0" encoding="utf-8"?> def get_base_url(): - if settings.base_url: - hostname = settings.base_url + if settings['server']['base_url']: + hostname = settings['server']['base_url'] else: scheme = 'http' if request.is_secure: @@ -243,9 +243,9 @@ def run(): from gevent import monkey monkey.patch_all() - app.run(debug = settings.debug - ,use_debugger = settings.debug - ,port = settings.port + app.run(debug = settings['server']['debug'] + ,use_debugger = settings['server']['debug'] + ,port = settings['server']['port'] ) |