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 2022/05/23 20:24:07 UTC
[airavata] branch develop updated (3ffe25098b -> 4d130b3374)
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 3ffe25098b Merge pull request #292 from isururanawaka/pythonSDK
add 32e128ed62 Updating Helix version
add a37ae49ef4 Relevant changes from htcondor branch
add bb732dfaf8 Merge branch 'htcondor-new'
add 4eaa9af99c Commenting out htcondor email configs
add d3e29bcf03 Update email-config.yaml.j2
add 08a15d1123 jackson 2.9.10.8
add 97a205cbc2 update versions
add f412aeb290 AIRAVATA-3590 upgrade log4j and commons-io
add e12c2497d5 AIRAVATA-3590 remove xmlbeans
add 4d9fd40c24 AIRAVATA-3411 Ansible: tusd_upload_dir for prod inventory
add c827dda002 Ansible: global floods - django app and geo db config
add 268eefae52 Ansible: production branch of lrose-sgci django app
add d5b4b5106f Ansible: trecx app id for prod amos gateway
add 0f873efd2e Removed CIRC email from the notification list.
add d3850be30f Ansible: disabling usd deploy until we get valid certs
add 145a4c8437 Increased the size of uploading files for MIGA gateway
new fe009e7112 AIRAVATA-3622 Force revalidation for non-hashed static files
new 4d130b3374 Merge branch 'AIRAVATA-3622' into develop
The 2 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:
.../iam-admin-services-core/pom.xml | 2 +-
.../scigap/develop/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/django/vars.yml | 1 +
.../production/host_vars/ampgateway/vars.yml | 3 +++
.../production/host_vars/global-flood/vars.yml | 8 +++++--
.../scigap/production/host_vars/lrose/vars.yml | 2 +-
.../host_vars/microbial-genomes/vars.yml | 2 ++
.../production/host_vars/pace-gatech/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 ++-
.../django/templates/django-ssl-vhost.conf.j2 | 9 ++++++++
.../roles/django/templates/django-vhost.conf.j2 | 8 +++++++
.../templates/email-monitor/email-config.yaml.j2 | 9 ++++++--
modules/distribution/pom.xml | 27 +++++++---------------
.../src/main/resources/email-config.yaml | 6 ++---
pom.xml | 8 +++----
16 files changed, 60 insertions(+), 38 deletions(-)
[airavata] 02/02: Merge branch 'AIRAVATA-3622' 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 4d130b3374e42d0a0ba380232acadb38a37771c4
Merge: 3ffe25098b fe009e7112
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon May 23 16:08:25 2022 -0400
Merge branch 'AIRAVATA-3622' into develop
.../iam-admin-services-core/pom.xml | 2 +-
.../scigap/develop/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/django/vars.yml | 1 +
.../production/host_vars/ampgateway/vars.yml | 3 +++
.../production/host_vars/global-flood/vars.yml | 8 +++++--
.../scigap/production/host_vars/lrose/vars.yml | 2 +-
.../host_vars/microbial-genomes/vars.yml | 2 ++
.../production/host_vars/pace-gatech/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 ++-
.../django/templates/django-ssl-vhost.conf.j2 | 9 ++++++++
.../roles/django/templates/django-vhost.conf.j2 | 8 +++++++
.../templates/email-monitor/email-config.yaml.j2 | 9 ++++++--
modules/distribution/pom.xml | 27 +++++++---------------
.../src/main/resources/email-config.yaml | 6 ++---
pom.xml | 8 +++----
16 files changed, 60 insertions(+), 38 deletions(-)
diff --cc modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
index cb99eda218,a91b374a53..7f804e99ff
--- a/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
+++ b/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
@@@ -20,6 -20,6 +20,6 @@@ config
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
- - jobManagerType: HTCONDOR
- emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
+ # - jobManagerType: HTCONDOR
+ # emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
-# resourceEmailAddresses:
++# resourceEmailAddresses:
[airavata] 01/02: AIRAVATA-3622 Force revalidation for non-hashed static files
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 fe009e7112a6328e3523e51a20e59a59719eeaab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon May 23 16:06:31 2022 -0400
AIRAVATA-3622 Force revalidation for non-hashed static files
---
.../ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 9 +++++++++
dev-tools/ansible/roles/django/templates/django-vhost.conf.j2 | 8 ++++++++
2 files changed, 17 insertions(+)
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 71b5323968..2c2f73f3b2 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
@@ -62,6 +62,15 @@
<Directory {{ doc_root_dir }}/static>
Require all granted
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript
+
+ # Force browser to revalidate cached static resources
+ Header set Cache-Control "no-cache"
+ # Workaround for ETag bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=45023#c22
+ RequestHeader edit "If-None-Match" '^"((.*)-gzip)"$' '"$1", "$2"'
+ # If file has a content hash, cache for a year
+ <FilesMatch "\.[0-9a-f]{8}\.(css|js)$">
+ Header set Cache-Control "max-age=31536000, public"
+ </FilesMatch>
</Directory>
Alias /media/ {{ airavata_django_checkout }}/django_airavata/media/
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 e5c4398198..db95fb6e01 100644
--- a/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
+++ b/dev-tools/ansible/roles/django/templates/django-vhost.conf.j2
@@ -39,6 +39,14 @@
<Directory {{ doc_root_dir }}/static>
Require all granted
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript
+
+ Header set Cache-Control "no-cache"
+ # Workaround for ETag bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=45023#c22
+ RequestHeader edit "If-None-Match" '^"((.*)-gzip)"$' '"$1", "$2"'
+ # If file has a content hash, cache for a year
+ <FilesMatch "\.[0-9a-f]{8}\.(css|js)$">
+ Header set Cache-Control "max-age=31536000, public"
+ </FilesMatch>
</Directory>
Alias /media/ {{ airavata_django_checkout }}/django_airavata/media/