aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-02-03 21:06:15 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-02-03 21:06:15 +0100
commite1ad5111872bcca3f15efef997569e9229a81e49 (patch)
tree9f66bd362e49cf6d8b8dc0230b81909293e84659
parentIt is now possible to give the address of a CDN server through the configurat... (diff)
downloadnewspipe-e1ad5111872bcca3f15efef997569e9229a81e49.tar.gz
newspipe-e1ad5111872bcca3f15efef997569e9229a81e49.tar.bz2
newspipe-e1ad5111872bcca3f15efef997569e9229a81e49.zip
fixed loading of the CDN address
-rw-r--r--src/conf.py3
-rw-r--r--src/conf/conf.cfg-sample2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/conf.py b/src/conf.py
index 8ee77ceb..38dbee69 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -23,6 +23,7 @@ TIME_ZONE = {
ON_HEROKU = int(os.environ.get('HEROKU', 0)) == 1
DEFAULTS = {"platform_url": "https://JARR.herokuapp.com/",
+ "cdn_address": "",
"admin_email": "root@jarr.localhost",
"postmark_api_key": "",
"recaptcha_public_key": "",
@@ -107,7 +108,7 @@ WEBSERVER_HOST = config.get('webserver', 'host')
WEBSERVER_PORT = config.getint('webserver', 'port')
WEBSERVER_SECRET = config.get('webserver', 'secret')
-CDN_ADDRESS = config.get('cdn', 'address')
+CDN_ADDRESS = config.get('cdn', 'cdn_address')
NOTIFICATION_EMAIL = config.get('notification', 'notification_email')
NOTIFICATION_HOST = config.get('notification', 'host')
diff --git a/src/conf/conf.cfg-sample b/src/conf/conf.cfg-sample
index 2bcbca74..bbbf5996 100644
--- a/src/conf/conf.cfg-sample
+++ b/src/conf/conf.cfg-sample
@@ -3,7 +3,7 @@ host = 127.0.0.1
port = 5000
secret = a secret only you know
[cdn]
-address = https://cdn.cedricbonhomme.org/
+cdn_address = https://cdn.cedricbonhomme.org/
[misc]
platform_url = http://127.0.0.1:5000/
admin_email =
bgstack15