Skip to content

Commit

Permalink
MORE work trying to fix #4
Browse files Browse the repository at this point in the history
I think it was the installation of python-bcrypt, but really,  ¯\_(ツ)_/¯.
  • Loading branch information
fake-name committed Mar 22, 2019
1 parent ccb3d81 commit b02939d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 5 additions & 5 deletions db_sync.sh
Expand Up @@ -15,17 +15,17 @@ set -e
# fi

echo "Fetching db dump from remote server";
ssh client@ks1 'sudo -u postgres pg_dump --clean -d wlndb | xz' | pv -cN Db-Fetch-Progress > ../dbBak/db_dump_$(date +%Y-%m-%d).sql.xz;
ssh client@ks1 'sudo -u postgres pg_dump --clean -d wlndb | xz' | pv -cN Db-Fetch-Progress > /media/Storage/Scripts/dbBak/db_dump_$(date +%Y-%m-%d).sql.xz
echo "Updating local database from dump file";
xz -d ../dbBak/db_dump_$(date +%Y-%m-%d).sql.xz -c | pv -c | ssh wlnuser@10.1.1.61 -t "psql -d wlndb"
xz -d /media/Storage/Scripts/dbBak/db_dump_$(date +%Y-%m-%d).sql.xz -c | pv -c | ssh wlnuser@10.1.1.61 -t "psql -d wlndb"
echo "Synchronizing cover folder!"
rsync -rvvP client@ks1:/media/Storage/wlnupdates/covers /media/Storage/Scripts/_web_resource_backend/; &
echo "Done!"

# Run the server
source flask/bin/activate
python run.py all
#source flask/bin/activate
#python run.py all


#sudo -H -u herp -- bash -c "ssh client@ks1 'tar -c /media/Storage/wlnupdates/covers | xz' | pv -cN Cover-Fetch-Progress > ../dbBak/cover_dump_$(date +%Y-%m-%d).tar.xz";
#sudo -H -u herp -- bash -c "ssh client@ks1 'tar -c /media/Storage/wlnupdates/covers | xz' | pv -cN Cover-Fetch-Progress > .$

2 changes: 0 additions & 2 deletions requirements.txt
Expand Up @@ -8,7 +8,6 @@ beautifulsoup4==4.7.1
bleach==3.1.0
blinker==1.4
cffi==1.12.2
bcrypt==3.1.6
## I'm still running py3.4 on Ubuntu 14.04 in a few places.
## TODO: Upgrade to 18.04
CherryPy<18.0.0 # pyup: <18.0.0
Expand Down Expand Up @@ -76,7 +75,6 @@ pyparsing==2.3.1
pytest==4.3.1
pytest-cov==2.6.1
pytest-random==0.2
python-bcrypt==0.3.2
python-dateutil==2.8.0
python-editor==1.0.4
python-Levenshtein==0.12.0
Expand Down

0 comments on commit b02939d

Please sign in to comment.