aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2014-01-20 08:19:59 +0100
committerCédric Bonhomme <kimble.mandel@gmail.com>2014-01-20 08:19:59 +0100
commit7ed3f7a8534013d4de6fe4e3a101efe0330ee93a (patch)
tree57f5c1a2a8ea4faecf2fb111bd5b97d9f290ed61
parentRemoved debug print. (diff)
downloadnewspipe-7ed3f7a8534013d4de6fe4e3a101efe0330ee93a.tar.gz
newspipe-7ed3f7a8534013d4de6fe4e3a101efe0330ee93a.tar.bz2
newspipe-7ed3f7a8534013d4de6fe4e3a101efe0330ee93a.zip
Updated default configuration file and README.
-rw-r--r--README.md5
-rw-r--r--conf/conf.cfg-sample4
2 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index 27ca04db..263e40ad 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Features
* articles are stored in a [MongoDB](http://www.mongodb.org/) database;
* fast full-text indexing and searching thanks the [Whoosh](https://bitbucket.org/mchaput/whoosh) library;
* e-mail notification;
+* export articles to HTML;
* favorite articles;
* share articles with Google +, Pinboard and reddit.
@@ -36,7 +37,9 @@ Configuration is done via the file **conf/conf.cfg**.
Alternatively you can run the script ``install.sh``.
-You can configure pyAggr3g470r (proxy, user agent, etc.) in the file ``conf/conf.cfg``.
+You can configure pyAggr3g470r (proxy, user agent, etc.) in the file ``conf/conf.cfg``.
+If you want to use pyAggr3g470r with Tor/Privoxy, you just have to set the value of
+``http_proxy`` (for example: ``http_proxy = 127.0.0.1:8118``). Else leave the value blank.
Backup
------
diff --git a/conf/conf.cfg-sample b/conf/conf.cfg-sample
index 23d3b3d5..07027bfd 100644
--- a/conf/conf.cfg-sample
+++ b/conf/conf.cfg-sample
@@ -5,7 +5,7 @@ port = 27017
username = root
password = root
[feedparser]
-http_proxy = 127.0.0.1:8118
+http_proxy =
user_agent = pyAggr3g470r (https://bitbucket.org/cedricbonhomme/pyaggr3g470r)
[webserver]
debug = 1
@@ -20,4 +20,4 @@ ssl = 1
username = your-gmail-username
password = your-gmail-password
mail_from = pyAggr3g470r@no-reply.com
-mail_to = recipent-email \ No newline at end of file
+mail_to = recipent-email
bgstack15