diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-04-07 13:24:54 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-04-07 13:24:54 +0200 |
| commit | f7b6902369c193f0102d1ec46243fea7b5a88174 (patch) | |
| tree | afe4271e1eeb192cd2af6782166eb275a4728769 | |
| parent | Merge branch 'master' into bookmark (diff) | |
| parent | PLATFORM_URL is not required. (diff) | |
| download | newspipe-f7b6902369c193f0102d1ec46243fea7b5a88174.tar.gz newspipe-f7b6902369c193f0102d1ec46243fea7b5a88174.tar.bz2 newspipe-f7b6902369c193f0102d1ec46243fea7b5a88174.zip | |
Merge branch 'master' into bookmark
| -rw-r--r-- | app.json | 10 | ||||
| -rw-r--r-- | src/conf.py | 5 |
2 files changed, 9 insertions, 6 deletions
@@ -28,11 +28,6 @@ } ], "env": { - "PLATFORM_URL": { - "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)", - "required": true, - "value": "" - }, "ADMIN_EMAIL": { "description": "Your email address for the authentication to the platform.", "required": true, @@ -53,6 +48,11 @@ "required": true, "value": "false" }, + "PLATFORM_URL": { + "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)", + "required": false, + "value": "" + }, "SECURITY_PASSWORD_SALT": { "description": "A secret to confirm user account with a link in an email.", "required": true, diff --git a/src/conf.py b/src/conf.py index 756c1557..9d4c363c 100644 --- a/src/conf.py +++ b/src/conf.py @@ -76,7 +76,10 @@ WEBSERVER_SECRET = config.get('webserver', 'secret_key') CDN_ADDRESS = config.get('cdn', 'cdn_address') -PLATFORM_URL = config.get('misc', 'platform_url') +try: + PLATFORM_URL = config.get('misc', 'platform_url') +except: + PLATFORM_URL = "https://www.newspipe.org/" ADMIN_EMAIL = config.get('misc', 'admin_email') SELF_REGISTRATION = config.getboolean('misc', 'self_registration') SECURITY_PASSWORD_SALT = config.get('misc', 'security_password_salt') |