aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2017-04-07 13:21:08 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2017-04-07 13:21:08 +0200
commit9935e40ffa9d4c5ef90f9ebb0a0b85cc15de48de (patch)
tree17006ed5f9e9454588326488acd2a5911f2c337c
parentno more submodule for bootstrap (diff)
downloadnewspipe-9935e40ffa9d4c5ef90f9ebb0a0b85cc15de48de.tar.gz
newspipe-9935e40ffa9d4c5ef90f9ebb0a0b85cc15de48de.tar.bz2
newspipe-9935e40ffa9d4c5ef90f9ebb0a0b85cc15de48de.zip
PLATFORM_URL is not required.
-rw-r--r--app.json10
-rw-r--r--src/conf.py5
2 files changed, 9 insertions, 6 deletions
diff --git a/app.json b/app.json
index 89d39bb5..a499e325 100644
--- a/app.json
+++ b/app.json
@@ -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 70fde9c4..96040a87 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')
bgstack15