move contact person to settings

NBISweden · Apr 12, 2019 · ebd668f · ebd668f
1 parent 781dda6
commit ebd668f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/backend/route.py b/backend/route.py
@@ -19,22 +19,21 @@
 
 # Setup the Tornado Application
 tornado_settings = {"debug": False,
-            "cookie_secret": swefreq_settings.cookie_secret,
-            "login_url": "/login",
-            "google_oauth": {
-                "key": swefreq_settings.google_key,
-                "secret": swefreq_settings.google_secret
-            },
-            "elixir_oauth": {
-                "id": swefreq_settings.elixir["id"],
-                "secret": swefreq_settings.elixir["secret"],
-                "redirect_uri": swefreq_settings.elixir["redirectUri"],
-            },
-            "contact_person": 'mats.dahlberg@scilifelab.se',
-            "redirect_uri": swefreq_settings.redirect_uri,
-            "xsrf_cookies": True,
-            "template_path": "templates/",
-        }
+                    "cookie_secret": swefreq_settings.cookie_secret,
+                    "login_url": "/login",
+                    "google_oauth": {
+                        "key": swefreq_settings.google_key,
+                        "secret": swefreq_settings.google_secret
+                    },
+                    "elixir_oauth": {
+                        "id": swefreq_settings.elixir["id"],
+                        "secret": swefreq_settings.elixir["secret"],
+                        "redirect_uri": swefreq_settings.elixir["redirectUri"],
+                    },
+                    "contact_person": swefreq_settings.contact_person,
+                    "redirect_uri": swefreq_settings.redirect_uri,
+                    "xsrf_cookies": True,
+                    "template_path": "templates/"}
 
 class Application(tornado.web.Application):
     def __init__(self, settings):

diff --git a/backend/settings.py b/backend/settings.py
@@ -32,6 +32,9 @@
 ## Generated with base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes)
 cookie_secret = json_settings["cookieSecret"]
 
+# Contact person
+contact_person = json_settings["contactPerson"]
+
 # PostgreSQL settings
 psql_host = json_settings["postgresHost"]
 psql_port = json_settings["postgresPort"]

diff --git a/settings_sample.json b/settings_sample.json
@@ -1,5 +1,6 @@
 {
     "cookieSecret" : "Something random for tornado to sign cookies with",
+    "contactPerson" : "someone@example.com",
 
     "googleKey" : "a key from google",
     "googleSecret" : "a secret from google",