You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/01/24 21:39:09 UTC
[airavata] 01/03: Ansible: configure virtual host timeout
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d8aacab1252bc903d48d018c5d3f5ade025dc376
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 24 16:18:52 2020 -0500
Ansible: configure virtual host timeout
---
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 1 +
dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index a1c719a..19601e9 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
diff --git a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
index 489ab2b..9f0bd55 100644
--- a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
+++ b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
@@ -29,6 +29,7 @@
<VirtualHost *:{{ httpd_default_http_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