Improved installation processus.

4 files changed, 11 insertions, 11 deletions

diff --git a/README.md b/README.md
index 4e94ae59..a59ce6f6 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,10 @@ In order to prevent all dependencies problems and to keep your system stable, th
 installed in a Python virtual environment (with [virtualenv](http://www.virtualenv.org)).
 The installation will use the configuration file for the database setup.
 
-You can configure pyAggr3g470r (proxy, user agent, etc.) in the file ``conf/conf.cfg``.  
-If you want to use pyAggr3g470r with Tor/Privoxy, you just have to set the value of
+As already said, you can configure pyAggr3g470r (database name, proxy, user agent, etc.) in the file ``conf/conf.cfg``.  
+For example if you want to use pyAggr3g470r with Tor/Privoxy, you just have to set the value of
 ``http_proxy`` (for example: ``http_proxy = 127.0.0.1:8118``). Else leave the value blank.
+The default configuration should be good, so you really juste have to run the script ``install.sh``.
 
 Backup
 ------
diff --git a/install.sh b/install.sh
index 5359e0a0..3528781b 100755
--- a/install.sh
+++ b/install.sh
@@ -13,7 +13,7 @@ pip install --upgrade -r requirements.txt
 
 # Configuration
 cp conf/conf.cfg-sample conf/conf.cfg
-python pyaggr3g470r/initialization.py pyaggr3g470r firstname lastname firstname.lastname@mail.com secret
+python pyaggr3g470r/initialization.py firstname lastname firstname.lastname@mail.com secret
 
 # Launch pyAggr3g470r
 python runserver.py
diff --git a/pyaggr3g470r/initialization.py b/pyaggr3g470r/initialization.py
index 5777ca12..15e83563 100644
--- a/pyaggr3g470r/initialization.py
+++ b/pyaggr3g470r/initialization.py
@@ -10,18 +10,18 @@ import sys
 from mongoengine import *
 from werkzeug import generate_password_hash
 
+import conf
 import models
 
 if __name__ == "__main__":
     # Point of entry in execution mode
-    database = sys.argv[1]
-    firstname = sys.argv[2]
-    lastname =  sys.argv[3]
-    email = sys.argv[4]
-    password = sys.argv[5]
+    firstname = sys.argv[1]
+    lastname =  sys.argv[2]
+    email = sys.argv[3]
+    password = sys.argv[4]
 
-    db = connect(database)
-    db.drop_database(database)
+    db = connect(conf.DATABASE_NAME)
+    db.drop_database(conf.DATABASE_NAME)
 
     user = models.User(firstname=firstname, lastname=lastname, \
                 email=email, pwdhash=generate_password_hash(password))
diff --git a/pyaggr3g470r/search.py b/pyaggr3g470r/search.py
index 4b8602f7..6be04588 100644
--- a/pyaggr3g470r/search.py
+++ b/pyaggr3g470r/search.py
@@ -36,7 +36,6 @@ from whoosh.qparser import QueryParser
 from whoosh.writing import AsyncWriter
 from collections import defaultdict
 
-import conf
 import utils
 import models