Merge branch 'reorganize_files' of git.ndn.cx:cavote

[cavote.git] / main.py

diff --git a/main.py b/main.py
index d56e251..3ac3664 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -15,18 +15,9 @@ import hashlib
 import smtplib
 import string
 
-DATABASE = '/tmp/cavote.db'
-PASSWD_SALT = 'change this value to some random chars!'
-SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
-DEBUG = True
-TITLE = u"Cavote FFDN"
-EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
-VERSION = "cavote 0.2.0"
-SMTP_SERVER = "127.0.0.1"
-PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
-
-app = Flask(__name__)
-app.config.from_object(__name__)
+from settings import *
+
+app = Flask(__name__) app.config.from_object(__name__)
 
 oid = OpenID(app)