[airavata] branch master updated: Ansible: configure Django timeout

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 38e4fac  Ansible: configure Django timeout
38e4fac is described below

commit 38e4facd94f5f0091a5ee6fe14565aeffb6faba0
Author: Marcus Christie <machr...@iu.edu>
AuthorDate: Fri Apr 10 12:48:46 2020 -0400

    Ansible: configure Django timeout
---
 .../scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2      | 1 +
 .../ansible/inventories/scigap/production/host_vars/seagrid/vars.yml     | 1 +
 dev-tools/ansible/roles/django/defaults/main.yml                         | 1 +
 dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2        | 1 +
 4 files changed, 4 insertions(+)

diff --git 
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
 
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
index 8c7333d..6060667 100644
--- 
a/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
+++ 
b/dev-tools/ansible/inventories/scigap/production/host_vars/dreg/files/django-ssl-vhost.conf.j2
@@ -40,6 +40,7 @@
 
 <VirtualHost *:{{ httpd_default_https_port }}>
     ServerName {{ vhost_servername }}
+    TimeOut {{ vhost_timeout }}
 
     Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
     Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
diff --git 
a/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml 
b/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
index 1682ac3..9d80b42 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/seagrid/vars.yml
@@ -21,6 +21,7 @@
 ---
 vhost_servername: "seagrid.org"
 vhost_ssl: True
+vhost_timeout: 300
 vhost_aliases:
   - url: /seagrid-rich-client/
     path: "{{ doc_root_dir }}/static/seagrid-rich-client/"
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml 
b/dev-tools/ansible/roles/django/defaults/main.yml
index 7cf6d69..9a72ec5 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -27,6 +27,7 @@ real_user_data_dir: "{{ user_data_dir }}"
 vhost_servername: "{{ groups['django'][0] }}"
 vhost_ssl: False
 vhost_aliases: []
+vhost_timeout: 60
 httpd_confd_file_location:
  RedHat: "/etc/httpd/conf.d/django-{{ gateway_id }}.conf"
  Debian: "/etc/apache2/sites-available/django-{{ gateway_id }}.conf"
diff --git a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 
b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2
index 13e5d5d..59268ce 100644
--- a/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2
@@ -38,6 +38,7 @@
 
 <VirtualHost *:{{ httpd_default_https_port }}>
     ServerName {{ vhost_servername }}
+    TimeOut {{ vhost_timeout }}
 
     Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
     Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico