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/02/19 18:17:12 UTC
[airavata] branch develop updated (2e00338 -> 253a96b)
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 2e00338 Merge pull request #241 from isururanawaka/pythonSDK
add 7d5e0a7 Ansible: update domain of simccs vm
add cf3368b Adding file upload size to futurewater
add 2b79774 Adding Microbial Genomes Gateway
add a98ffa4 Adding Microbial Genomes Gateway
add 44148a1 Adding Microbial Genomes Gateway
add c1f1928 Adding Microbial Genomes Gateway CILogon
add 38153ca Adding Microbial Genomes Gateway CILogon and gateway SSH key
add 74aa58d Ansible: fix exp data dir for dreg
add 5ea7267 Changing uploading fie size in toppic gateway
add 4030ab2 Merge branch 'master' of https://github.com/apache/airavata
add 895bba9 Merge branch 'AIRAVATA-3284--Ansible--clean-up-past-built-CSS/JS-files'
add 1ec128a Ansible: deploy dev maptool branch to simccs.org
add 4993068 Ansible: deploy gw19 tutorial to testdrive
add 531a743 Increased the file upload size to 258 for distant reader
add 050a304 Ansible: remove unneeded volume mount
new 3ea326f AIRAVATA-3290 Automatically call set_wagtail_site
new 253a96b Merge branch 'AIRAVATA-3290--Ansible--automatically-set-wagtail-site-record' 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:
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../production/host_vars/distantreader/vars.yml | 2 +-
.../scigap/production/host_vars/dreg/vars.yml | 2 +-
.../production/host_vars/futurewater/vars.yml | 2 ++
.../{pace-gatech => microbial-genomes}/vars.yml | 22 +++++++++++-----------
.../host_vars/microbial-genomes/vault.yml | 15 +++++++++++++++
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/production/host_vars/simccs/vars.yml | 18 ++++++++++++------
.../scigap/production/host_vars/testdrive/vars.yml | 2 ++
.../scigap/production/host_vars/toppic/vars.yml | 2 ++
.../ansible/inventories/scigap/production/hosts | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 13 +++++++++++--
12 files changed, 60 insertions(+), 22 deletions(-)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{pace-gatech => microbial-genomes}/vars.yml (54%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/microbial-genomes/vault.yml
[airavata] 02/02: Merge branch
'AIRAVATA-3290--Ansible--automatically-set-wagtail-site-record' 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 253a96b60b82df7cdceb35a265eaa90b7988eb22
Merge: 2e00338 3ea326f
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Feb 19 12:59:11 2020 -0500
Merge branch 'AIRAVATA-3290--Ansible--automatically-set-wagtail-site-record' into develop
.../scigap/production/group_vars/django/vars.yml | 2 +-
.../production/host_vars/distantreader/vars.yml | 2 +-
.../scigap/production/host_vars/dreg/vars.yml | 2 +-
.../production/host_vars/futurewater/vars.yml | 2 ++
.../{toppic => microbial-genomes}/vars.yml | 22 +++++++++++-----------
.../host_vars/microbial-genomes/vault.yml | 15 +++++++++++++++
.../simccs/files/django-ssl-vhost.conf.j2 | 1 +
.../scigap/production/host_vars/simccs/vars.yml | 18 ++++++++++++------
.../scigap/production/host_vars/testdrive/vars.yml | 2 ++
.../scigap/production/host_vars/toppic/vars.yml | 2 ++
.../ansible/inventories/scigap/production/hosts | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 13 +++++++++++--
12 files changed, 60 insertions(+), 22 deletions(-)
[airavata] 01/02: AIRAVATA-3290 Automatically call set_wagtail_site
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 3ea326faf318390b4f7475af420ace0ff96d8a24
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Feb 19 12:59:01 2020 -0500
AIRAVATA-3290 Automatically call set_wagtail_site
---
dev-tools/ansible/roles/django/tasks/main.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 9ad5cee..2e8124b 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -174,6 +174,17 @@
become: yes
become_user: "{{user}}"
+- name: Run Django's manage.py set_wagtail_site based on hostname
+ django_manage:
+ command: set_wagtail_site
+ app_path: "{{ airavata_django_checkout }}"
+ virtualenv: "{{ django_venv_dir }}"
+ become: yes
+ become_user: "{{user}}"
+ # if there are no Django Portal pages in Wagtail, then this command fails,
+ # but we can ignore it until Wagtail pages are created
+ ignore_errors: yes
+
- name: Run Django's manage.py collectstatic
django_manage:
command: "collectstatic -i node_modules --noinput"