diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
| commit | 29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch) | |
| tree | 52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /vagrant/conf.cfg-sample | |
| parent | misc update (diff) | |
| parent | Minor changes to the CSS. (diff) | |
| download | newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2 newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
pyaggr3g470r/controllers/feed.py
pyaggr3g470r/templates/home.html
Diffstat (limited to 'vagrant/conf.cfg-sample')
| -rw-r--r-- | vagrant/conf.cfg-sample | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vagrant/conf.cfg-sample b/vagrant/conf.cfg-sample index 93a0b89c..fa76caad 100644 --- a/vagrant/conf.cfg-sample +++ b/vagrant/conf.cfg-sample @@ -1,10 +1,11 @@ [misc] -platform_url = https://pyaggr3g470r.herokuapp.com/ +platform_url = http://127.0.0.1:5000/ admin_email = recaptcha_public_key = recaptcha_private_key = log_path = ./pyaggr3g470r/var/pyaggr3g470r.log python = python3 +nb_worker = 5 [database] uri = postgres://vagrant:xxYzToW42@127.0.0.1:5432/aggregator [feedparser] |