aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-21 14:52:59 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-21 14:52:59 +0100
commit7cec6957e15a0dabfa39843d2fed77d765754961 (patch)
treef4cb8bc6d234bb9dc3ed1ff3352911ed3f2de337
parentUpdated bootstrap.sh. (diff)
downloadnewspipe-7cec6957e15a0dabfa39843d2fed77d765754961.tar.gz
newspipe-7cec6957e15a0dabfa39843d2fed77d765754961.tar.bz2
newspipe-7cec6957e15a0dabfa39843d2fed77d765754961.zip
Updated README.
-rw-r--r--README.rst15
-rw-r--r--conf/conf.cfg-sample2
2 files changed, 8 insertions, 9 deletions
diff --git a/README.rst b/README.rst
index c8805ef9..33333284 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,6 @@ Deploying the application with Vagrant
''''''''''''''''''''''''''''''''''''''
Installation of VirtualBox and Vagrant
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. code:: bash
@@ -46,8 +45,7 @@ Installation of VirtualBox and Vagrant
$ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb
$ sudo dpkg -i vagrant_1.6.3_x86_64.deb
-Deployment of pyAggr3g470r in a Vagrant VM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Deployment of pyAggr3g470r
.. code:: bash
@@ -109,6 +107,7 @@ Deploying the application on a traditional server
.. code:: bash
+ $ sudo apt-get install -y python libpq-dev python-dev python-pip git
$ git clone https://bitbucket.org/cedricbonhomme/pyaggr3g470r.git
$ cd pyaggr3g470r
$ sudo apt-get install libxml2-dev libxslt1-dev
@@ -121,19 +120,19 @@ If you want to use PostgreSQL
.. code:: bash
$ sudo apt-get install postgresql postgresql-server-dev-9.3 postgresql-client
- $ echo "127.0.0.1:5432:aggregator:vagrant:xxYzToW42" > ~/.pgpass
+ $ echo "127.0.0.1:5432:aggregator:pgsqluser:pgsqlpwd" > ~/.pgpass
$ chmod 700 ~/.pgpass
- $ sudo -u postgres createuser vagrant --no-superuser --createdb --no-createrole
+ $ sudo -u postgres createuser pgsqluser --no-superuser --createdb --no-createrole
$ createdb aggregator --no-password
- $ echo "ALTER USER vagrant WITH ENCRYPTED PASSWORD 'xxYzToW42';" | sudo -u postgres psql
- echo "GRANT ALL PRIVILEGES ON DATABASE aggregator TO vagrant;" | sudo -u postgres psql
+ $ echo "ALTER USER pgsqluser WITH ENCRYPTED PASSWORD 'pgsqlpwd';" | sudo -u postgres psql
+ $ echo "GRANT ALL PRIVILEGES ON DATABASE aggregator TO pgsqluser;" | sudo -u postgres psql
Edit the configuration file with the line:
.. code:: cfg
[database]
- uri = postgres://vagrant:xxYzToW42@127.0.0.1:5433/aggregator
+ uri = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5433/aggregator
If you want to use SQLite
~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/conf/conf.cfg-sample b/conf/conf.cfg-sample
index 48cbe7c9..0135551a 100644
--- a/conf/conf.cfg-sample
+++ b/conf/conf.cfg-sample
@@ -5,7 +5,7 @@ recaptcha_public_key =
recaptcha_private_key =
log_path = ./pyaggr3g470r/var/pyaggr3g470r.log
[database]
-uri = postgres://vagrant:xxYzToW42@127.0.0.1:5432/aggregator
+uri = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5432/aggregator
[feedparser]
http_proxy =
user_agent = pyAggr3g470r (https://bitbucket.org/cedricbonhomme/pyaggr3g470r)
bgstack15