From 8231424fab182ef7af6c943c53502eadfa137905 Mon Sep 17 00:00:00 2001 From: sam Date: Sat, 2 Mar 2019 14:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Django_Friends/urls.py | 2 +- Django_Friends/wsgi.py | 4 ++-- scripts/celery.sh | 2 +- scripts/deploy.sh | 2 +- scripts/restart.sh | 2 +- scripts/script.py | 2 +- scripts/start.sh | 4 ++-- scripts/stop.sh | 2 +- scripts/upload.sh | 2 +- worker/__init__.py | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Django_Friends/urls.py b/Django_Friends/urls.py index d60c214..14ced70 100644 --- a/Django_Friends/urls.py +++ b/Django_Friends/urls.py @@ -1,4 +1,4 @@ -"""Django_TanTan URL Configuration +"""Django_Friends URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.11/topics/http/urls/ diff --git a/Django_Friends/wsgi.py b/Django_Friends/wsgi.py index 6335434..138c5ee 100644 --- a/Django_Friends/wsgi.py +++ b/Django_Friends/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for Django_TanTan project. +WSGI config for Django_Friends project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_TanTan.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_Friends.settings") application = get_wsgi_application() diff --git a/scripts/celery.sh b/scripts/celery.sh index 9434855..26453af 100755 --- a/scripts/celery.sh +++ b/scripts/celery.sh @@ -1,6 +1,6 @@ #!/bin/bash -PROJECT_DIR='/opt/Django_TanTan' +PROJECT_DIR='/opt/Django_Friends' LOGFILE="$PROJECT_DIR/logs/celery.log" cd $PROJECT_DIR diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 7933b80..4303dec 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -122,7 +122,7 @@ install_python() { # 项目环境初始化 project_init() { echo '正在设置项目环境...' - proj='/opt/Django_TanTan/' + proj='/opt/Django_Friends/' mkdir -p $proj/{data,logs} echo '正在创建 python 运行环境...' diff --git a/scripts/restart.sh b/scripts/restart.sh index b58375c..4326873 100755 --- a/scripts/restart.sh +++ b/scripts/restart.sh @@ -1,6 +1,6 @@ #!/bin/bash -PROJECT_DIR='/opt/Django_TanTan' +PROJECT_DIR='/opt/Django_Friends' PIDFILE="$PROJECT_DIR/logs/gunicorn.pid" # 简单粗暴,但是有效 diff --git a/scripts/script.py b/scripts/script.py index b478494..47af11f 100644 --- a/scripts/script.py +++ b/scripts/script.py @@ -15,7 +15,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) sys.path.insert(0,BASE_DIR) -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_TanTan.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_Friends.settings") django.setup() diff --git a/scripts/start.sh b/scripts/start.sh index 09f5ea6..fd4e2f8 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,8 +1,8 @@ #!/bin/bash -PROJECT_DIR='/opt/Django_TanTan' +PROJECT_DIR='/opt/Django_Friends' cd $PROJECT_DIR #source .venv/bin/activate -gunicorn -c Django_TanTan/gunicorn_config.py Django_TanTan.wsgi +gunicorn -c Django_Friends/gunicorn_config.py Django_Friends.wsgi #deactivate diff --git a/scripts/stop.sh b/scripts/stop.sh index 7bba440..1bbf866 100755 --- a/scripts/stop.sh +++ b/scripts/stop.sh @@ -1,6 +1,6 @@ #!/bin/bash -PROJECT_DIR='/opt/Django_TanTan' +PROJECT_DIR='/opt/Django_Friends' PIDFILE="$PROJECT_DIR/logs/gunicorn.pid" kill `cat $PIDFILE` diff --git a/scripts/upload.sh b/scripts/upload.sh index 5de09cb..30d1b55 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -1,7 +1,7 @@ #!/bin/bash LOCAL_DIR='./' -REMOTE_DIR='/opt/Django_TanTan' +REMOTE_DIR='/opt/Django_Friends' USER='root' HOST='samsa.xin' diff --git a/worker/__init__.py b/worker/__init__.py index 3d061af..c888bf8 100644 --- a/worker/__init__.py +++ b/worker/__init__.py @@ -13,9 +13,9 @@ from worker import config # 设置默认django环境 -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Django_TanTan.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'Django_Friends.settings') -celery_app = Celery('Django_TanTan') +celery_app = Celery('Django_Friends') celery_app.config_from_object(config) celery_app.autodiscover_tasks()