diff --git a/hb_server/apps/develop/tasks.py b/hb_server/apps/develop/tasks.py index c167aad..3a5ea27 100644 --- a/hb_server/apps/develop/tasks.py +++ b/hb_server/apps/develop/tasks.py @@ -12,15 +12,13 @@ def backup_database(): """ import datetime name = datetime.datetime.now().strftime('%Y%m%d%H%M%S') - command = '''pg_dump "user=postgres password=zcDsj2021 dbname=hberp" > - /home/lighthouse/backup/hberp_{}.sql'''.format(name) + command = '''pg_dump "user=postgres password=zcDsj2021 dbname=hberp" > /home/lighthouse/backup/hberp_{}.sql'''.format(name) completed = subprocess.run(command, shell=True, capture_output=True, text=True) return completed @shared_task def reload_server(): - os.chdir('/home/lighthouse/hberp') - command = 'sudo git pull && sudo service supervisor reload' + command = 'bash /home/lighthouse/hberp/hb_server/git.sh' completed = subprocess.run(command, shell=True, capture_output=True, text=True) return completed diff --git a/hb_server/git.sh b/hb_server/git.sh new file mode 100644 index 0000000..d7cbef4 --- /dev/null +++ b/hb_server/git.sh @@ -0,0 +1,7 @@ +#!/bin/bash +cd /home/lighthouse/hberp +sudo git pull +cd /home/lighthouse/hberp/hb_client +npm run build:prod +rsync -avu /home/lighthouse/hberp/hb_client/dist/ /home/lighthouse/hberp/hb_server/vuedist/ +sudo service supervisor reload \ No newline at end of file