searx

commit: 8fe660b1dff4af6cff1292bb436b286ab2f91789
parent: 1b3712c1893ac730fed8c0eca7dd344595593fe7
Author: asciimoo <asciimoo@gmail.com>
Date:   Sat, 19 Oct 2013 16:25:06 +0200

[mod] config file replaced

Diffstat:
M
README.md
3
+--
D
searx.conf_sample
7
-------
M
searx/webapp.py
8
--------

3 files changed, 1 insertion(+), 17 deletions(-)
diff --git 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
@@ -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
@@ -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