diff --git a/deploy.sh b/deploy.sh index 568986ba97d22622a9a3ced698280b647a60353e..6fe44f07fcb233a6739efb8dff767fa0f114c034 100644 --- a/deploy.sh +++ b/deploy.sh @@ -47,20 +47,13 @@ git clone git@gitlab.noc.soton.ac.uk:owanes/gliders-website.git # then fetch all our log files and parse them! cd gliders-tools python setup.py install - -if [ -f /usr/bin/pypy ]; then - mkdir -p /home/gliders/pypyenv - virtualenv -p /usr/bin/pypy /home/gliders/pypyenv --system-site-packages - source /home/gliders/pypyenv/bin/activate - pypy -m pip install pymysql - pypy -m pip install python-dateutil - pypy -m pip install lxml==3.4.4 - pypy -m pip install sqlalchemy - pypy -m pip install elasticsearch - pypy -m pip install pymongo - pypy setup.py install - source /home/gliders/pythonenv/bin/activate -fi +pip install pymysql +pip install python-dateutil +pip install lxml==3.4.4 +pip install sqlalchemy +pip install elasticsearch +pip install pymongo +python setup.py install sudo cp fetchlogs.service /etc/systemd/system/ sudo systemctl enable fetchlogs @@ -71,7 +64,7 @@ mysql -u root -p$pass < new_schema.sql echo "CREATE USER 'gliders'@'%' IDENTIFIED BY '"$pass"' ;" | mysql -u root -p$pass echo "GRANT ALL ON gliders.* TO 'gliders'@'%';" | mysql -u root -p$pass cd bin -sh migrate_data.sh +sh migrate_data.sh $pass sudo systemctl start fetchlogs # Set up a GitHub API key and add it to .bash_profile diff --git a/install.sh b/install.sh old mode 100644 new mode 100755