airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch staging updated: Ansible config to reroute pga admin dashboard to django
Date Fri, 12 Jul 2019 14:21:26 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new 4680bd9  Ansible config to reroute pga admin dashboard to django
4680bd9 is described below

commit 4680bd9d86c4f4a4bcd724507351bb9b79f421fa
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Fri Jul 12 10:20:44 2019 -0400

    Ansible config to reroute pga admin dashboard to django
---
 .../inventories/scigap/staging/pga_config/seagrid/vars.yml   |  2 ++
 dev-tools/ansible/roles/pga/defaults/main.yml                |  2 ++
 dev-tools/ansible/roles/pga/templates/pga_config.php.j2      | 12 ++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
index fa1a0f6..5f303fa 100644
--- a/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
@@ -64,5 +64,7 @@ portal_email_password: "{{ vault_portal_email_password }}"
 portal_theme: "seagrid"
 portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
 portal_title: "SEAGrid Portal"
+pga_reroute_to_django: true
+pga_airavata_django_url: "https://django.staging.seagrid.org"
 #pga_google_analytics_id: "UA-110457476-1"
 ...
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 12317a4..96d6ee0 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -99,6 +99,8 @@ portal_theme: "base"
 portal_theme_repo: ""
 portal_title: "Airavata PHP Gateway"
 pga_google_analytics_id: ""
+# When pga_reroute_to_django is true, pga_airavata_django_url should also be set
+pga_reroute_to_django: false
 
 pga_default_http_port: 80
 pga_default_https_port: 443
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index 7d102ff..d6d408e 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -250,6 +250,18 @@ return array(
          */
         'portal-smtp-server-port' => '587',
 
+        {% if pga_airavata_django_url is defined %}
+        /**
+         * Set the URL of the new Django portal for re-routing
+         */
+        'airavata-django-url' => "{{ pga_airavata_django_url }}",
+        {% endif %}
+
+        /**
+         * Set to true to enable reroute to the new Django portal
+         */
+        'reroute-to-django' => {{ pga_reroute_to_django | ternary("true", "false") }},
+
         /**
          * Set JIRA Issue Collector scripts here.
          */


Mime
View raw message