# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-08-25 17:48:45
# Node ID cce68b00e8fe2973802811c54de9cb43c9e9a50e
# Parent  cbae2025e85b814ee7122af8dfdd1a054e4f25f7

Move default config in own module

diff --git a/ennstatus/__init__.py b/ennstatus/__init__.py
--- a/ennstatus/__init__.py
+++ b/ennstatus/__init__.py
@@ -21,6 +21,9 @@ def create_app():
 
     app = Flask(__name__)
 
+    import ennstatus.config as config
+    config.init_app(app)
+
     if not hasattr(app.config, 'from_json'):
         def from_json(file, silent=True):
             try:
@@ -40,8 +43,6 @@ def create_app():
         app.config.from_json = from_json
 
     app.config.from_json(config_file)
-    app.config.setdefault('ENNSTATUS_MOMENTJS_FORMAT', 'DD MMMM YYYY HH:mm:ss')
-    app.config.setdefault('ENNSTATUS_STRFTIME_FORMAT', '%d %B %Y %H:%M:%S')
 
     app.wsgi_app = ProxyFix(app.wsgi_app)
 
diff --git a/ennstatus/config.py b/ennstatus/config.py
new file mode 100644
--- /dev/null
+++ b/ennstatus/config.py
@@ -0,0 +1,22 @@
+import os
+import base64
+
+
+def init_app(app):
+
+    config = app.config
+
+    _default_secret_key = base64.b64encode(os.urandom(32)).decode('utf-8')
+
+    config['SECRET_KEY'] = os.environ.get('SECRET_KEY', _default_secret_key)
+
+    # Flask-Bootstrap
+    config.setdefault('BOOTSTRAP_SERVE_LOCAL', True)
+
+    # ennstatus
+
+    # moment.js string formatting
+    # http://momentjs.com/docs/#/displaying/format/
+    config.setdefault('ENNSTATUS_MOMENTJS_FORMAT', 'DD MMMM YYYY HH:mm:ss')
+
+    config.setdefault('ENNSTATUS_STRFTIME_FORMAT', '%d %B %Y %H:%M:%S')