Updated conf file for Vagrant.

2 files changed, 5 insertions, 4 deletions

diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index f756c468..3dd1a510 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -2,7 +2,7 @@
 

 apt-get update

 apt-get upgrade

-apt-get install -y python libpq-dev python-dev python-pip build-essential git

+apt-get install -y python3 libpq-dev python3-dev build-essential git

 

 # Clone the source code of pyAggr3g470r

 git clone https://bitbucket.org/cedricbonhomme/pyaggr3g470r.git

@@ -16,7 +16,7 @@ cd pyaggr3g470r
 # For lxml:

 apt-get install -y libxml2-dev libxslt1-dev

 # installation with pip

-sudo pip install --upgrade -r requirements.txt

+sudo pip3 install --upgrade -r requirements.txt

 # copy of the default configuration files for vagrant

 cp vagrant/conf.cfg-sample conf/conf.cfg

 cd ..

@@ -35,12 +35,12 @@ echo "GRANT ALL PRIVILEGES ON DATABASE aggregator TO vagrant;" | sudo -u postgre
 # Initializes the database

 cd pyaggr3g470r

 chown -R vagrant:vagrant .

-sudo -u vagrant python db_create.py

+sudo -u vagrant python3 db_create.py

 

 # start pyAggr3g470r at startup

 echo "#!/bin/sh -e" > /etc/rc.local

 echo "cd /home/vagrant/pyaggr3g470r/" >> /etc/rc.local

-echo "sudo -u vagrant python runserver.py &" >> /etc/rc.local

+echo "sudo -u vagrant python3 runserver.py &" >> /etc/rc.local

 echo "exit 0" >> /etc/rc.local

 chmod 755 /etc/rc.local

 

diff --git a/vagrant/conf.cfg-sample b/vagrant/conf.cfg-sample
index 48cbe7c9..93a0b89c 100644
--- a/vagrant/conf.cfg-sample
+++ b/vagrant/conf.cfg-sample
@@ -4,6 +4,7 @@ admin_email =
 recaptcha_public_key =
 recaptcha_private_key =
 log_path = ./pyaggr3g470r/var/pyaggr3g470r.log
+python = python3
 [database]
 uri = postgres://vagrant:xxYzToW42@127.0.0.1:5432/aggregator
 [feedparser]