aboutsummaryrefslogtreecommitdiff
path: root/install.sh
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-04-20 23:35:20 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-04-20 23:35:20 +0200
commitd468e262780935320b3ee22c273e150a3345ec2f (patch)
tree40c72b9f1cfeca4e1b1e0ef24a37862b9ad902d9 /install.sh
parentLink to about page is not only visible for the administrator. (diff)
downloadnewspipe-d468e262780935320b3ee22c273e150a3345ec2f.tar.gz
newspipe-d468e262780935320b3ee22c273e150a3345ec2f.tar.bz2
newspipe-d468e262780935320b3ee22c273e150a3345ec2f.zip
Fixed the default configuration file. Minor update to the install.sh script.
Diffstat (limited to 'install.sh')
-rwxr-xr-xinstall.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/install.sh b/install.sh
index 101e388c..e8c1ab1d 100755
--- a/install.sh
+++ b/install.sh
@@ -16,7 +16,7 @@ cp conf/conf.cfg-sample conf/conf.cfg
# Delete default database configuration
sed -i '/database/d' conf/conf.cfg
-sed -i '/uri/d' conf/conf.cfg
+sed -i '/database_url/d' conf/conf.cfg
if [ "$1" == postgres ]; then
sudo apt-get install -y postgresql postgresql-server-dev-9.3 postgresql-client
@@ -30,12 +30,12 @@ if [ "$1" == postgres ]; then
# Add configuration lines for PostgreSQL
echo '[database]' >> conf/conf.cfg
- echo 'uri = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5432/aggregator' >> conf/conf.cfg
+ echo 'database_url = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5432/aggregator' >> conf/conf.cfg
elif [ "$1" == sqlite ]; then
sudo pip install pysqlite # not working with Python 3!
# Add configuration lines for SQLite
echo '[database]' >> conf/conf.cfg
- echo 'uri = sqlite+pysqlite:///pyAggr3g470r.db' >> conf/conf.cfg
+ echo 'database_url = sqlite+pysqlite:///pyAggr3g470r.db' >> conf/conf.cfg
fi
python manager.py db_empty
bgstack15