aboutsummaryrefslogtreecommitdiff
path: root/source/conf.py
diff options
context:
space:
mode:
Diffstat (limited to 'source/conf.py')
-rw-r--r--source/conf.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/conf.py b/source/conf.py
index 98aa0d48..1b262927 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -20,9 +20,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
__author__ = "Cedric Bonhomme"
-__version__ = "$Revision: 0.1 $"
+__version__ = "$Revision: 0.2 $"
__date__ = "$Date: 2012/04/22 $"
-__revision__ = "$Date: 2012/04/22 $"
+__revision__ = "$Date: 2013/08/15 $"
__copyright__ = "Copyright (c) Cedric Bonhomme"
__license__ = "GPLv3"
@@ -43,6 +43,10 @@ MONGODB_DBNAME = config.get('MongoDB', 'dbname')
MONGODB_USER = config.get('MongoDB', 'user')
MONGODB_PASSWORD = config.get('MongoDB', 'password')
+HTTP_PROXY = config.get('feedparser', 'http_proxy')
+USER_AGENT = config.get('feedparser', 'user_agent')
+FEED_LIST = config.get('feedparser', 'feed_list')
+
MAIL_ENABLED = bool(int(config.get('mail','enabled')))
mail_from = config.get('mail','mail_from')
mail_to = config.get('mail','mail_to')
@@ -50,6 +54,4 @@ smtp_server = config.get('mail','smtp')
username = config.get('mail','username')
password = config.get('mail','password')
-DIASPORA_POD = config.get('misc', 'diaspora_pod')
-FEED_LIST = config.get('misc', 'feed_list')
-HTTP_PROXY = config.get('misc', 'http_proxy')
+DIASPORA_POD = config.get('misc', 'diaspora_pod') \ No newline at end of file
bgstack15