##// END OF EJS Templates
Fix upload files
jespinoza -
r10:ac38b2ff3424
parent child
Show More
@@ -1,3 +1,4
1 MADROOT=/madrigal
1 MADROOT=/madrigal
2 EXP_DIR=/usr/local/experiments
2 EXP_DIR=/data/madrigal/experiments
3 MAD_PORT=8080
3 META_DIR=/data/madrigal/metadata
4 MAD_PORT=80
@@ -7,10 +7,11 services:
7 restart: always
7 restart: always
8 image: madrigal
8 image: madrigal
9 working_dir: /madrigal/source/madpy/djangoMad
9 working_dir: /madrigal/source/madpy/djangoMad
10 command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
10 command: gunicorn djangoMad.wsgi --timeout 600 --bind 0.0.0.0:8000
11 env_file: .env
11 env_file: .env
12 volumes:
12 volumes:
13 - '${EXP_DIR}:/madrigal/experiments'
13 - '${EXP_DIR}:/madrigal/experiments'
14 - '${META_DIR}:/madrigal/metadata'
14 - './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
15 - './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
15
16
16 nginx:
17 nginx:
@@ -6,7 +6,7 upstream djangomad {
6
6
7 server {
7 server {
8 listen 8080;
8 listen 8080;
9 client_max_body_size 50M;
9 client_max_body_size 100M;
10
10
11 location /madrigal {
11 location /madrigal {
12 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
12 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -19,4 +19,8 server {
19 location /madrigal/static/ {
19 location /madrigal/static/ {
20 alias /static/;
20 alias /static/;
21 }
21 }
22 proxy_connect_timeout 600;
23 proxy_send_timeout 600;
24 proxy_read_timeout 600;
25 send_timeout 600;
22 }
26 }
@@ -26,7 +26,7 def index(request):
26 if request.method == 'POST':
26 if request.method == 'POST':
27 form = UpdataForm(request.POST, request.FILES)
27 form = UpdataForm(request.POST, request.FILES)
28 files = request.FILES.getlist('file')
28 files = request.FILES.getlist('file')
29 files.sort()
29 #files.sort()
30 filenames = []
30 filenames = []
31
31
32 choose = request.POST.get('choose')
32 choose = request.POST.get('choose')
General Comments 0
You need to be logged in to leave comments. Login now