Commit f8dfa19c authored by jkvis's avatar jkvis

Removed LGTC/NIPT; Added larger timeouts; Removed downloading upload module...

Removed LGTC/NIPT; Added larger timeouts; Removed downloading upload module (this is now permanently broken); I had to downgrade more-itertools in the virtualenv to version 5.0.0 manually
parent b850575d
......@@ -36,4 +36,4 @@ nginx_source_configure_flags: "{{nginx_source_default_configure_flags}}{% for ke
# upload module
nginx_upload_module_version: "2.2"
nginx_upload_module_url: "https://github.com/vkholodkov/nginx-upload-module/archive/{{nginx_upload_module_version}}.tar.gz"
nginx_upload_module_url: "https://github.com/fdintino/nginx-upload-module/archive/{{nginx_upload_module_version}}.tar.gz"
......@@ -49,14 +49,6 @@
opts: rw,hard,intr,rsize=32768,wsize=32768,tcp,vers=3,noatime
state: mounted
- name: mount NIPT storage
mount:
name: /data/DIV5/NIPT
src: hpc-cluster.research-isilon.researchlumc.nl:/ifs/exports-shark/data/nipt/transfer
fstype: nfs
opts: rw,hard,intr,rsize=32768,wsize=32768,tcp,vers=3,noatime
state: mounted
- name: mount Pathology storage
mount:
name: /data/DIV5/Pathology
......@@ -121,14 +113,6 @@
opts: rw,hard,intr,rsize=32768,wsize=32768,tcp,vers=3,noatime
state: mounted
- name: mount LGTC Isilon storage
mount:
name: /data/DIV5/LGTC
src: hpc-cluster.research-isilon.researchlumc.nl:/ifs/exports-shark/data/lgtc/projects/DataFromGS
fstype: nfs
opts: rw,hard,intr,rsize=32768,wsize=32768,tcp,vers=3,noatime
state: mounted
- name: mount MM storage
mount:
name: /data/DIV5/MM
......
......@@ -65,32 +65,6 @@
state: directory
when: transfer_mount_point_scratch.stat.exists == False
- name: Transfer Server | Test whether the NIPT mount point exists
stat: path="/data/DIV5/NIPT"
register: transfer_mount_point_nipt
- name: Transfer Server | Make the NIPT mount point
file:
path: "/data/DIV5/NIPT"
owner: root
group: root
mode: 0770
state: directory
when: transfer_mount_point_nipt.stat.exists == False
- name: Transfer Server | Test whether the LGTC mount point exists
stat: path="/data/DIV5/LGTC"
register: transfer_mount_point_lgtc
- name: Transfer Server | Make the LGTC mount point
file:
path: "/data/DIV5/LGTC"
owner: root
group: root
mode: 0770
state: directory
when: transfer_mount_point_lgtc.stat.exists == False
- name: Transfer Server | Test whether the RSE mount point exists
stat: path="/data/DIV5/RSE"
register: transfer_mount_point_rse
......
---
- name: Nginx | Modules | Download the upload_module source
get_url:
url: "{{nginx_upload_module_url}}"
dest: "/tmp/nginx_upload_module-{{nginx_upload_module_version}}.tar.gz"
#- name: Nginx | Modules | Download the upload_module source
# get_url:
# url: "{{nginx_upload_module_url}}"
# dest: "/tmp/nginx_upload_module-{{nginx_upload_module_version}}.tar.gz"
- name: Nginx | Modules | Unpack the upload_module source
command: tar -xvzf /tmp/nginx_upload_module-{{nginx_upload_module_version}}.tar.gz chdir=/tmp creates=/tmp/nginx-upload-module-{{nginx_upload_module_version}}
......@@ -11,21 +11,21 @@ server {
ssl_certificate {{nginx_ssl_certificate}};
ssl_certificate_key {{nginx_ssl_certificate_key}};
ssl_session_timeout 180m;
ssl_session_timeout 1d;
ssl_protocols SSLv2 SSLv3 TLSv1;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
client_max_body_size 500G;
keepalive_timeout 900;
keepalive_timeout 1d;
access_log {{nginx_log_dir}}/default.access.log;
location ~ ^/transfers/(.+)/uploads {
proxy_connect_timeout 900;
proxy_read_timeout 900;
proxy_send_timeout 900;
proxy_connect_timeout 1d;
proxy_read_timeout 1d;
proxy_send_timeout 1d;
upload_pass @upstream;
upload_resumable off;
......@@ -48,9 +48,9 @@ server {
}
location @upstream {
proxy_connect_timeout 900;
proxy_read_timeout 900;
proxy_send_timeout 900;
proxy_connect_timeout 1d;
proxy_read_timeout 1d;
proxy_send_timeout 1d;
proxy_pass http://127.0.0.1:8001;
}
......
......@@ -6,7 +6,7 @@ After=network.target
[Service]
PIDFile=/run/transfer/transfer.pid
WorkingDirectory=/srv/transfer
ExecStart=/srv/transfer/virtualenv/bin/gunicorn --timeout 900 --workers 3 --preload --pid /run/transfer/transfer.pid transfer:app
ExecStart=/srv/transfer/virtualenv/bin/gunicorn --timeout 86400 --workers 3 --preload --pid /run/transfer/transfer.pid transfer:app
ExecReload=/bin/kill -s HUP $MAINPID
ExecStop=/bin/kill -s TERM $MAINPID
Environment=TRANSFER_CONFIG=/srv/transfer/config.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment