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 2021/02/23 18:19:06 UTC
[airavata] branch develop updated (6d18965 -> 67fc7b8)
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 6d18965 Merge branch 'airavata-3411' into develop
new 9dd14eb AIRAVATA-3411 disable tus for now for amp, geo
new 71815bd AIRAVATA-3411 Define the tus upload directory in django group
new 67fc7b8 Merge branch 'airavata-3411' into develop
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:
dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml | 2 ++
dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml | 2 ++
3 files changed, 5 insertions(+)
[airavata] 01/03: AIRAVATA-3411 disable tus for now for amp, geo
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 9dd14eb34c95b5ff056108ade81e5cf61d276e55
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 23 13:16:31 2021 -0500
AIRAVATA-3411 disable tus for now for amp, geo
---
dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml | 2 ++
dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
index 7167c68..ddc98e8 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml
@@ -24,6 +24,8 @@ user_data_dir: "{{ real_user_data_dir }}"
#airavata_django_git_branch: "simccs"
vhost_servername: "dev.ampgateway.org"
vhost_ssl: true
+# tus isn't setup yet
+tusd_vhost_servername:
# sudo certbot --apache certonly -d django.simccs.scigap.org
ssl_certificate_file: "/etc/letsencrypt/live/dev.ampgateway.org/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/dev.ampgateway.org/fullchain.pem"
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
index a0193ac..7a06a2c 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml
@@ -28,6 +28,8 @@ user_data_dir: "{{ real_user_data_dir }}"
#airavata_django_git_branch: "simccs"
vhost_servername: "beta.geogateway.scigap.org"
vhost_ssl: true
+# tus isn't setup yet
+tusd_vhost_servername:
# sudo certbot --apache certonly -d django.simccs.scigap.org
ssl_certificate_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.geogateway.scigap.org/fullchain.pem"
[airavata] 02/03: AIRAVATA-3411 Define the tus upload directory in
django group
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 71815bdd1f28cb45efa9cb21b4baaac33417f97b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 23 13:18:19 2021 -0500
AIRAVATA-3411 Define the tus upload directory in django group
---
dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
index 0619bb1..cef47c6 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml
@@ -30,5 +30,6 @@ django_error_emails: "[('Marcus Christie', 'machrist@iu.edu'), ('Eroma Abeysingh
django_database_name: "django_{{ gateway_id }}"
django_hidden_airavata_apps: "['django_airavata_dataparsers']"
tusd_vhost_servername: "tus.dev.scigap.org"
+tusd_upload_dir: "{{real_user_data_dir}}/tus-temp-dir"
airavata_django_git_branch: "develop"
# django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata", "resources", "incommon_rsa_server_ca.pem")'
[airavata] 03/03: Merge branch 'airavata-3411' 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 67fc7b8c07014357901ef8e86966398230d676aa
Merge: 6d18965 71815bd
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 23 13:18:29 2021 -0500
Merge branch 'airavata-3411' into develop
dev-tools/ansible/inventories/scigap/develop/group_vars/django/vars.yml | 1 +
dev-tools/ansible/inventories/scigap/develop/host_vars/amp/vars.yml | 2 ++
dev-tools/ansible/inventories/scigap/develop/host_vars/geo/vars.yml | 2 ++
3 files changed, 5 insertions(+)