aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-05-03 18:07:34 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-05-03 18:07:34 +0200
commit6b1a82f07d5cfd98c2b67b802e50ef0f0b309043 (patch)
treea26dc332eeac8dc736fdfa2ebdfc7a923c830864
parentDisplay the ration only for the tab 'All'. (diff)
downloadnewspipe-6b1a82f07d5cfd98c2b67b802e50ef0f0b309043.tar.gz
newspipe-6b1a82f07d5cfd98c2b67b802e50ef0f0b309043.tar.bz2
newspipe-6b1a82f07d5cfd98c2b67b802e50ef0f0b309043.zip
Fixed a bug when sending emails (email of the sender was empty).
-rw-r--r--app.json1
-rw-r--r--conf.py5
-rw-r--r--conf/conf.cfg-sample2
3 files changed, 5 insertions, 3 deletions
diff --git a/app.json b/app.json
index 05975d06..faf4545c 100644
--- a/app.json
+++ b/app.json
@@ -14,6 +14,7 @@
"env": {
"HEROKU": "1",
"ADMIN_EMAIL": "root@pyAggr3g470r.localhost",
+ "NOTIFICATION_SENDER": "pyAggr3g470r@no-reply.com",
"ADMIN_PASSWORD": "password",
"RECAPTCHA_PRIVATE_KEY": "REDACTED",
"RECAPTCHA_PUBLIC_KEY": "REDACTED",
diff --git a/conf.py b/conf.py
index e71009bf..696ecf97 100644
--- a/conf.py
+++ b/conf.py
@@ -23,6 +23,7 @@ TIME_ZONE = {
ON_HEROKU = int(os.environ.get('HEROKU', 0)) == 1
DEFAULTS = {"platform_url": "https://pyaggr3g470r.herokuapp.com/",
+ "admin_email": "root@pyAggr3g470r.localhost",
"postmark_api_key": "",
"recaptcha_public_key": "",
"recaptcha_private_key": "",
@@ -36,7 +37,7 @@ DEFAULTS = {"platform_url": "https://pyaggr3g470r.herokuapp.com/",
"http_proxy": "",
"secret": "",
"enabled": "false",
- "email": "",
+ "notification_sender": "pyAggr3g470r@no-reply.com",
"tls": "false",
"ssl": "true",
"host": "0.0.0.0",
@@ -101,7 +102,7 @@ WEBSERVER_HOST = config.get('webserver', 'host')
WEBSERVER_PORT = config.getint('webserver', 'port')
WEBSERVER_SECRET = config.get('webserver', 'secret')
-NOTIFICATION_EMAIL = config.get('notification', 'email')
+NOTIFICATION_EMAIL = config.get('notification', 'notification_sender')
NOTIFICATION_HOST = config.get('notification', 'host')
NOTIFICATION_PORT = config.getint('notification', 'port')
NOTIFICATION_TLS = config.getboolean('notification', 'tls')
diff --git a/conf/conf.cfg-sample b/conf/conf.cfg-sample
index b141e93c..6e6cae54 100644
--- a/conf/conf.cfg-sample
+++ b/conf/conf.cfg-sample
@@ -19,7 +19,7 @@ http_proxy =
user_agent = pyAggr3g470r (https://bitbucket.org/cedricbonhomme/pyaggr3g470r)
resolve_article_url = false
[notification]
-email = pyAggr3g470r@no-reply.com
+notification_sender = pyAggr3g470r@no-reply.com
host = smtp.googlemail.com
port = 465
tls = false
bgstack15