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:08 UTC
[airavata] branch develop updated (59972be -> e6a927c)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 59972be Ansible: beta.simccs.org: temporary deploy of feature branch
add cea84c3 Ansible: disable tus uploads on delta
add 2aa1e53 Ansible: move simccs to dedicated vm
add e120dba Ansible: updating ssh key for delta storage pref
add f9acba9 Ansible: change label on CILogon auth option
new d8aacab Ansible: configure virtual host timeout
new 1082e09 Merge branch 'ansible-django-vhost-timeout' into develop
new e6a927c Ansible: bump up timeout for beta.simccs.org
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/develop/host_vars/simccs/vars.yml | 2 +
.../scigap/production/host_vars/delta/vars.yml | 3 +-
.../newsimccs/files/django-ssl-vhost.conf.j2 | 82 ----------------------
.../scigap/production/host_vars/newsimccs/vars.yml | 70 ------------------
.../production/host_vars/newsimccs/vault.yml | 15 ----
.../scigap/production/host_vars/simccs/vars.yml | 15 ++--
.../scigap/production/host_vars/testdrive/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 +-
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../django/templates/django-ssl-vhost.conf.j2 | 1 +
.../roles/django/templates/django-vhost.conf.j2 | 1 +
12 files changed, 21 insertions(+), 175 deletions(-)
delete mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newsimccs/files/django-ssl-vhost.conf.j2
delete mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newsimccs/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newsimccs/vault.yml
[airavata] 03/03: Ansible: bump up timeout for beta.simccs.org
Posted by ma...@apache.org.
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 e6a927c46dd9bbef07b2977bf6a9a4d0f3fee4c9
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 24 16:29:55 2020 -0500
Ansible: bump up timeout for beta.simccs.org
---
.../scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 1 +
dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
index b6be6da..6090cd1 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -38,6 +38,7 @@
<VirtualHost *:{{ httpd_default_https_port }}>
ServerName {{ vhost_servername }}
+ TimeOut {{ vhost_timeout }}
# Reverse proxy to geoserver on gf8
ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 29cc0b5..0a410ad 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -31,6 +31,8 @@ airavata_django_extra_dependencies:
- pyjnius
vhost_servername: "beta.simccs.org"
vhost_ssl: True
+# Some of the maptool views call into Java code and can take 2-3 minutes to execute
+vhost_timeout: 300
# sudo certbot --apache certonly -d django.simccs.scigap.org
ssl_certificate_file: "/etc/letsencrypt/live/beta.simccs.org/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.simccs.org/fullchain.pem"
[airavata] 02/03: Merge branch 'ansible-django-vhost-timeout' into
develop
Posted by ma...@apache.org.
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 1082e09a36843ca482fcc7bf6f63a8626f28cf4e
Merge: 59972be d8aacab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 24 16:19:01 2020 -0500
Merge branch 'ansible-django-vhost-timeout' into develop
.../scigap/production/host_vars/delta/vars.yml | 3 +-
.../newsimccs/files/django-ssl-vhost.conf.j2 | 82 ----------------------
.../scigap/production/host_vars/newsimccs/vars.yml | 70 ------------------
.../production/host_vars/newsimccs/vault.yml | 15 ----
.../scigap/production/host_vars/simccs/vars.yml | 15 ++--
.../scigap/production/host_vars/testdrive/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 +-
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../django/templates/django-ssl-vhost.conf.j2 | 1 +
.../roles/django/templates/django-vhost.conf.j2 | 1 +
10 files changed, 18 insertions(+), 175 deletions(-)
[airavata] 01/03: Ansible: configure virtual host timeout
Posted by ma...@apache.org.
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