From b02939d2cd415afd5d7de3418c4ff368d1e3de80 Mon Sep 17 00:00:00 2001 From: Fake-Name Date: Fri, 22 Mar 2019 15:30:48 -0700 Subject: [PATCH] =?UTF-8?q?MORE=20work=20trying=20to=20fix=20https://githu?= =?UTF-8?q?b.com/fake-name/wlnupdates/issues/4=20I=20think=20it=20was=20th?= =?UTF-8?q?e=20installation=20of=20python-bcrypt,=20but=20really,=20=20?= =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db_sync.sh | 10 +++++----- requirements.txt | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/db_sync.sh b/db_sync.sh index bb88a3042..d6aceb2fe 100644 --- a/db_sync.sh +++ b/db_sync.sh @@ -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 > .$ diff --git a/requirements.txt b/requirements.txt index 68c9fb2ac..8d511dec0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 @@ -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