:art: Update deploy
huangqimin001
Se han modificado 9 ficheros con 24 adiciones y 21 borrados
+ 2
- 0
requirements_dj.txt
@@ -6,10 +6,12 @@ django-json-render==1.0.3 |
||
| 6 | 6 |
django-json-response==1.1.5 |
| 7 | 7 |
django-logit==1.1.3 |
| 8 | 8 |
django-models-ext==1.1.10 |
| 9 |
+django-paginator2==1.1.3 |
|
| 9 | 10 |
django-redis-connector==1.0.4 |
| 10 | 11 |
django-response==1.1.1 |
| 11 | 12 |
django-rlog==1.0.7 |
| 12 | 13 |
django-short-url==1.1.6 |
| 14 |
+django-shortuuidfield==0.1.3 |
|
| 13 | 15 |
django-six==1.0.4 |
| 14 | 16 |
django-uniapi==1.0.10 |
| 15 | 17 |
django-we==1.5.6 |
+ 1
- 0
requirements_pywe.txt
@@ -1,2 +1,3 @@ |
||
| 1 |
+pywe-miniapp==1.1.6 |
|
| 1 | 2 |
pywe-oauth==1.1.1 |
| 2 | 3 |
pywe-pay==1.0.14 |
+ 1
- 1
tiwen/deploy.bak/supervisor_commands/pollqueue.ini
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
[program:pollqueue] |
| 2 |
-command=/home/diors/env/bin/python /home/diors/work/tiwen/manage.py poll_queue |
|
| 2 |
+command=/home/diors/env/bin/python /home/paiai/work/tiwen/manage.py poll_queue |
|
| 3 | 3 |
autostart=true |
| 4 | 4 |
autorestart=true |
| 5 | 5 |
startretries=3 |
+ 1
- 1
tiwen/deploy.bak/supervisor_commands/rlistlog.ini
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
[program:rlistlog] |
| 2 |
-command=/home/diors/env/bin/python /home/diors/work/tiwen/manage.py rlistlog --key=django:logit:tiwen --filename=/tmp/tiwen.logit.log |
|
| 2 |
+command=/home/diors/env/bin/python /home/paiai/work/tiwen/manage.py rlistlog --key=django:logit:tiwen --filename=/tmp/tiwen.logit.log |
|
| 3 | 3 |
autostart=true |
| 4 | 4 |
autorestart=true |
| 5 | 5 |
startretries=3 |
+ 2
- 2
tiwen/deploy.bak/tiwen.ini
@@ -4,7 +4,7 @@ |
||
| 4 | 4 |
|
| 5 | 5 |
# Django-related settings |
| 6 | 6 |
# the base directory (full path) |
| 7 |
-chdir = /home/diors/work/tiwen |
|
| 7 |
+chdir = /home/paiai/work/tiwen |
|
| 8 | 8 |
# Django's wsgi file |
| 9 | 9 |
module = tiwen.wsgi |
| 10 | 10 |
# the virtualenv (full path) |
@@ -16,7 +16,7 @@ master = true |
||
| 16 | 16 |
# maximum number of worker processes |
| 17 | 17 |
processes = 10 |
| 18 | 18 |
# the socket (use the full path to be safe |
| 19 |
-socket = /home/diors/work/tiwen/tiwen/deploy/tiwen.sock |
|
| 19 |
+socket = /home/paiai/work/tiwen/tiwen/deploy/tiwen.sock |
|
| 20 | 20 |
# ... with appropriate permissions - may be needed |
| 21 | 21 |
chmod-socket = 777 |
| 22 | 22 |
# clear environment on exit |
+ 2
- 2
tiwen/deploy.bak/tiwen2.ini
@@ -4,7 +4,7 @@ |
||
| 4 | 4 |
|
| 5 | 5 |
# Django-related settings |
| 6 | 6 |
# the base directory (full path) |
| 7 |
-chdir = /home/diors/work/tiwen |
|
| 7 |
+chdir = /home/paiai/work/tiwen |
|
| 8 | 8 |
# Django's wsgi file |
| 9 | 9 |
module = tiwen.wsgi |
| 10 | 10 |
# the virtualenv (full path) |
@@ -16,7 +16,7 @@ master = true |
||
| 16 | 16 |
# maximum number of worker processes |
| 17 | 17 |
processes = 10 |
| 18 | 18 |
# the socket (use the full path to be safe |
| 19 |
-socket = /home/diors/work/tiwen/tiwen/deploy/tiwen2.sock |
|
| 19 |
+socket = /home/paiai/work/tiwen/tiwen/deploy/tiwen2.sock |
|
| 20 | 20 |
# ... with appropriate permissions - may be needed |
| 21 | 21 |
chmod-socket = 777 |
| 22 | 22 |
# clear environment on exit |
+ 11
- 11
tiwen/deploy.bak/tiwen_nginx.conf
@@ -3,10 +3,10 @@ |
||
| 3 | 3 |
# the upstream component nginx needs to connect to |
| 4 | 4 |
upstream tiwen {
|
| 5 | 5 |
# Single Server |
| 6 |
- # server unix:///home/diors/work/tiwen/tiwen/deploy/tiwen.sock; # for a file socket |
|
| 6 |
+ # server unix:///home/paiai/work/tiwen/tiwen/deploy/tiwen.sock; # for a file socket |
|
| 7 | 7 |
# Multi Server |
| 8 |
- # server unix:///home/diors/work/tiwen/tiwen/deploy/tiwen.sock max_fails=0 weight=1; # for a file socket |
|
| 9 |
- # server unix:///home/diors/work/tiwen/tiwen/deploy/tiwen2.sock max_fails=0 weight=1; # for a file socket |
|
| 8 |
+ # server unix:///home/paiai/work/tiwen/tiwen/deploy/tiwen.sock max_fails=0 weight=1; # for a file socket |
|
| 9 |
+ # server unix:///home/paiai/work/tiwen/tiwen/deploy/tiwen2.sock max_fails=0 weight=1; # for a file socket |
|
| 10 | 10 |
server 127.0.0.1:8888; # for a web port socket (we'll use this first) |
| 11 | 11 |
} |
| 12 | 12 |
|
@@ -27,23 +27,23 @@ server {
|
||
| 27 | 27 |
|
| 28 | 28 |
# JS接口安全域名 & 业务域名 验证 |
| 29 | 29 |
location /xxx.txt {
|
| 30 |
- alias /home/diors/work/tiwen/docs/we/xxx.txt; |
|
| 30 |
+ alias /home/paiai/work/tiwen/docs/we/xxx.txt; |
|
| 31 | 31 |
} |
| 32 | 32 |
|
| 33 | 33 |
# Django media |
| 34 | 34 |
location /media {
|
| 35 |
- alias /home/diors/work/tiwen/media; # your Django project's media files - amend as required |
|
| 35 |
+ alias /home/paiai/work/tiwen/media; # your Django project's media files - amend as required |
|
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
location /static {
|
| 39 |
- alias /home/diors/work/tiwen/collect_static; # your Django project's static files - amend as required |
|
| 39 |
+ alias /home/paiai/work/tiwen/collect_static; # your Django project's static files - amend as required |
|
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 | 42 |
# Finally, send all non-media requests to the Django server. |
| 43 | 43 |
location / {
|
| 44 | 44 |
# uwsgi_pass tiwen; |
| 45 | 45 |
proxy_pass http://tiwen; |
| 46 |
- include /home/diors/work/tiwen/tiwen/deploy/uwsgi_params; # the uwsgi_params file you installed |
|
| 46 |
+ include /home/paiai/work/tiwen/tiwen/deploy/uwsgi_params; # the uwsgi_params file you installed |
|
| 47 | 47 |
} |
| 48 | 48 |
} |
| 49 | 49 |
|
@@ -75,22 +75,22 @@ server {
|
||
| 75 | 75 |
|
| 76 | 76 |
# JS接口安全域名 & 业务域名 验证 |
| 77 | 77 |
location /xxx.txt {
|
| 78 |
- alias /home/diors/work/tiwen/docs/we/xxx.txt; |
|
| 78 |
+ alias /home/paiai/work/tiwen/docs/we/xxx.txt; |
|
| 79 | 79 |
} |
| 80 | 80 |
|
| 81 | 81 |
# Django media |
| 82 | 82 |
location /media {
|
| 83 |
- alias /home/diors/work/tiwen/media; # your Django project's media files - amend as required |
|
| 83 |
+ alias /home/paiai/work/tiwen/media; # your Django project's media files - amend as required |
|
| 84 | 84 |
} |
| 85 | 85 |
|
| 86 | 86 |
location /static {
|
| 87 |
- alias /home/diors/work/tiwen/collect_static; # your Django project's static files - amend as required |
|
| 87 |
+ alias /home/paiai/work/tiwen/collect_static; # your Django project's static files - amend as required |
|
| 88 | 88 |
} |
| 89 | 89 |
|
| 90 | 90 |
# Finally, send all non-media requests to the Django server. |
| 91 | 91 |
location / {
|
| 92 | 92 |
# uwsgi_pass tiwen; |
| 93 | 93 |
proxy_pass http://tiwen; |
| 94 |
- include /home/diors/work/tiwen/tiwen/deploy/uwsgi_params; # the uwsgi_params file you installed |
|
| 94 |
+ include /home/paiai/work/tiwen/tiwen/deploy/uwsgi_params; # the uwsgi_params file you installed |
|
| 95 | 95 |
} |
| 96 | 96 |
} |
+ 2
- 2
tiwen/deploy.bak/tiwen_supervisor.ini
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
[program:tiwen] |
| 2 |
-command=/home/diors/env/bin/uwsgi --ini /home/diors/work/tiwen/tiwen/deploy/tiwen.ini |
|
| 2 |
+command=/home/diors/env/bin/uwsgi --ini /home/paiai/work/tiwen/tiwen/deploy/tiwen.ini |
|
| 3 | 3 |
autostart=true |
| 4 | 4 |
autorestart=true |
| 5 | 5 |
startretries=3 |
@@ -9,4 +9,4 @@ stopasgroup=true |
||
| 9 | 9 |
killasgroup=true |
| 10 | 10 |
stdout_logfile=/var/log/supervisor_tiwen_access.log |
| 11 | 11 |
stderr_logfile=/var/log/supervisor_tiwen_error.log |
| 12 |
-user=diors |
|
| 12 |
+user=paiai |
+ 2
- 2
tiwen/deploy.bak/tiwen_supervisor2.ini
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
[program:tiwen2] |
| 2 |
-command=/home/diors/env/bin/uwsgi --ini /home/diors/work/tiwen/tiwen/deploy/tiwen2.ini |
|
| 2 |
+command=/home/diors/env/bin/uwsgi --ini /home/paiai/work/tiwen/tiwen/deploy/tiwen2.ini |
|
| 3 | 3 |
autostart=true |
| 4 | 4 |
autorestart=true |
| 5 | 5 |
startretries=3 |
@@ -9,4 +9,4 @@ stopasgroup=true |
||
| 9 | 9 |
killasgroup=true |
| 10 | 10 |
stdout_logfile=/var/log/supervisor_tiwen2_access.log |
| 11 | 11 |
stderr_logfile=/var/log/supervisor_tiwen2_error.log |
| 12 |
-user=diors |
|
| 12 |
+user=paiai |