From 4388459247da30da00650280f03a792e432fd983 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 1 Mar 2022 08:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BAsh=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/.gitignore            |  1 +
 hb_server/apps/develop/tasks.py | 12 +++++++++---
 hb_server/cbeat_start.sh        |  4 ----
 hb_server/cworker_start.sh      |  4 ----
 hb_server/git.sh                |  7 -------
 hb_server/gunicorn_start.sh     |  4 ----
 6 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 hb_server/cbeat_start.sh
 delete mode 100644 hb_server/cworker_start.sh
 delete mode 100644 hb_server/git.sh
 delete mode 100644 hb_server/gunicorn_start.sh

diff --git a/hb_server/.gitignore b/hb_server/.gitignore
index df1c6b0..f5f2ce9 100644
--- a/hb_server/.gitignore
+++ b/hb_server/.gitignore
@@ -4,6 +4,7 @@
 venv/
 __pycache__/
 *.pyc
+sh/*
 media/*
 static/*
 vuedist/*
diff --git a/hb_server/apps/develop/tasks.py b/hb_server/apps/develop/tasks.py
index 5b7351f..398ad36 100644
--- a/hb_server/apps/develop/tasks.py
+++ b/hb_server/apps/develop/tasks.py
@@ -4,6 +4,7 @@ from rest_framework.response import Response
 from celery import shared_task
 import os
 import subprocess
+from server.settings_pro import DATABASES, BACKUP_DATABASE_PATH
 
 @shared_task
 def backup_database():
@@ -12,13 +13,18 @@ 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/database/hberp_{}.sql'''.format(name)
+    command = 'pg_dump "user={} password={} dbname={}" > {}/hberp_{}.sql'.format(
+        DATABASES['default']['USER'],
+        DATABASES['default']['PASSWORD'],
+        DATABASES['default']['NAME'],
+        BACKUP_DATABASE_PATH,
+        name)
     completed = subprocess.run(command, shell=True, capture_output=True, text=True)
     return completed
 
 @shared_task
 def reload_server():
-    command = 'bash /home/lighthouse/hberp/hb_server/git.sh'
+    command = 'bash /home/lighthouse/hberp/hb_server/sh/git.sh'
     completed = subprocess.run(command, shell=True, capture_output=True, text=True)
     return completed
 
@@ -30,7 +36,7 @@ def reload_server_only():
 
 @shared_task
 def backup_media():
-    command = 'rsync -avu /home/lighthouse/hberp/hb_server/media/ /home/lighthouse/backup/media/'
+    command = 'bash /home/lighthouse/hberp/hb_server/sh/backup_media.sh'
     completed = subprocess.run(command, shell=True, capture_output=True, text=True)
     return completed
 
diff --git a/hb_server/cbeat_start.sh b/hb_server/cbeat_start.sh
deleted file mode 100644
index cd68f13..0000000
--- a/hb_server/cbeat_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/lighthouse/hberp/hb_server
-source venv/bin/activate
-exec celery -A server beat -l info
diff --git a/hb_server/cworker_start.sh b/hb_server/cworker_start.sh
deleted file mode 100644
index bad19e2..0000000
--- a/hb_server/cworker_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/lighthouse/hberp/hb_server
-source venv/bin/activate
-exec celery -A server worker -l info
diff --git a/hb_server/git.sh b/hb_server/git.sh
deleted file mode 100644
index d7cbef4..0000000
--- a/hb_server/git.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
diff --git a/hb_server/gunicorn_start.sh b/hb_server/gunicorn_start.sh
deleted file mode 100644
index b842dc0..0000000
--- a/hb_server/gunicorn_start.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd /home/lighthouse/hberp/hb_server
-source venv/bin/activate
-exec gunicorn -w 5 -b 0.0.0.0:2223 server.wsgi