From 8fe660b1dff4af6cff1292bb436b286ab2f91789 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Sat, 19 Oct 2013 16:25:06 +0200 Subject: [PATCH] [mod] config file replaced --- README.md | 3 +-- searx.conf_sample | 7 ------- searx/webapp.py | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 searx.conf_sample diff --git a/README.md b/README.md index 056cf02f6..2bbce7908 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,7 @@ A hackable [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine) * install dependencies: `pip install -r requirements.txt` * clone source: `git clone git@github.com:asciimoo/searx.git && cd searx` -* create a config file: `cp searx.conf_sample search.conf` -* edit your config (set your `secret_key`!) +* edit your [searx/settings.py](https://github.com/asciimoo/searx/blob/master/searx/settings.py) (set your `secret_key`!) * run `python searx/webapp.py` to start the application ### TODO diff --git a/searx.conf_sample b/searx.conf_sample deleted file mode 100644 index 50f5e2a56..000000000 --- a/searx.conf_sample +++ /dev/null @@ -1,7 +0,0 @@ -[app] -secret_key = "yourultrasecretkey" # change this! - -[server] -port = 8888 -debug = False - diff --git a/searx/webapp.py b/searx/webapp.py index 4e81ed093..51d910da2 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -23,18 +23,10 @@ if __name__ == "__main__": path.append(realpath(dirname(realpath(__file__))+'/../')) from flask import Flask, request, flash, render_template, url_for, Response, make_response -import ConfigParser -from os import getenv from searx.engines import search, categories from searx import settings import json -cfg = ConfigParser.SafeConfigParser() -cfg.read('/etc/searx.conf') -cfg.read(getenv('HOME')+'/.searxrc') -cfg.read(getenv('HOME')+'/.config/searx/searx.conf') -cfg.read('searx.conf') - app = Flask(__name__) app.secret_key = settings.secret_key