diff --git a/.env b/.env index af14dfa..05e12b7 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ MADROOT=/madrigal -EXP_DIR=/usr/local/experiments -MAD_PORT=8080 +EXP_DIR=/data/madrigal/experiments +META_DIR=/data/madrigal/metadata +MAD_PORT=80 diff --git a/docker-compose.yml b/docker-compose.yml index 683d233..cd33726 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,10 +7,11 @@ services: restart: always image: madrigal working_dir: /madrigal/source/madpy/djangoMad - command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000 + command: gunicorn djangoMad.wsgi --timeout 600 --bind 0.0.0.0:8000 env_file: .env volumes: - '${EXP_DIR}:/madrigal/experiments' + - '${META_DIR}:/madrigal/metadata' - './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad' nginx: diff --git a/nginx/app.conf b/nginx/app.conf index 7eb6919..0dc5378 100644 --- a/nginx/app.conf +++ b/nginx/app.conf @@ -6,7 +6,7 @@ upstream djangomad { server { listen 8080; - client_max_body_size 50M; + client_max_body_size 100M; location /madrigal { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -19,4 +19,8 @@ server { location /madrigal/static/ { alias /static/; } + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; } diff --git a/source/madpy/djangoMad/apps/updata/views.py b/source/madpy/djangoMad/apps/updata/views.py index ebf2b90..533a4ad 100755 --- a/source/madpy/djangoMad/apps/updata/views.py +++ b/source/madpy/djangoMad/apps/updata/views.py @@ -26,7 +26,7 @@ def index(request): if request.method == 'POST': form = UpdataForm(request.POST, request.FILES) files = request.FILES.getlist('file') - files.sort() + #files.sort() filenames = [] choose = request.POST.get('choose')