aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-21 10:37:35 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-11-21 10:37:35 +0100
commitb1cc171b1bf9aa1b91b4e6e25fd161a920e9388b (patch)
tree0c4df05aea99fe3473a151466bb56e60e400e934
parentFixed Vagrant bootstrap.sh file. (diff)
downloadnewspipe-b1cc171b1bf9aa1b91b4e6e25fd161a920e9388b.tar.gz
newspipe-b1cc171b1bf9aa1b91b4e6e25fd161a920e9388b.tar.bz2
newspipe-b1cc171b1bf9aa1b91b4e6e25fd161a920e9388b.zip
Updated README.
-rw-r--r--README.rst20
1 files changed, 8 insertions, 12 deletions
diff --git a/README.rst b/README.rst
index 75a34f3b..8e2bf7d6 100644
--- a/README.rst
+++ b/README.rst
@@ -92,7 +92,7 @@ Deploying the application on a traditional server
$ cd pyaggr3g470r
$ sudo apt-get install libxml2-dev libxslt1-dev
$ sudo pip install --upgrade -r requirements.txt
- $ cp conf/conf.cfg{.sample,}
+ $ cp conf/conf.cfg-sample conf/conf.cfg
If you want to use PostgreSQL
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -100,23 +100,19 @@ If you want to use PostgreSQL
.. code:: bash
$ sudo apt-get install postgresql postgresql-server-dev-9.3 postgresql-client
- $ sudo -u postgres createuser
- Enter name of role to add: username
- Shall the new role be a superuser? (y/n) n
- Shall the new role be allowed to create databases? (y/n) y
- Shall the new role be allowed to create more new roles? (y/n) n
- $ createdb pyAggr3g470r
- $ sudo -u postgres psql
- postgres=# ALTER USER username WITH ENCRYPTED PASSWORD 'password';
- postgres=# GRANT ALL PRIVILEGES ON DATABASE pyAggr3g470r TO username;
- postgres=# \q
+ $ echo "127.0.0.1:5432:aggregator:vagrant:xxYzToW42" > ~/.pgpass
+ $ chmod 700 ~/.pgpass
+ $ sudo -u postgres createuser vagrant --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
Edit the configuration file with the line:
.. code:: cfg
[database]
- uri = postgres://username:password@127.0.0.1:5433/pyAggr3g470r
+ uri = postgres://vagrant:xxYzToW42@127.0.0.1:5433/aggregator
If you want to use SQLite
~~~~~~~~~~~~~~~~~~~~~~~~~
bgstack15