airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: Added PGA theme checkout, config to ansible role
Date Wed, 05 Apr 2017 14:13:17 GMT
Repository: airavata
Updated Branches:
  refs/heads/master dc55333a6 -> 2e6437a7e


Added PGA theme checkout, config to ansible role

Also setting PGA title, fixes to setting admin emails


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2e6437a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e6437a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e6437a7

Branch: refs/heads/master
Commit: 2e6437a7e0f682cda8cfa10855ffabe8c957972c
Parents: dc55333
Author: Marcus Christie <machristie@apache.org>
Authored: Wed Apr 5 10:02:05 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Wed Apr 5 10:11:46 2017 -0400

----------------------------------------------------------------------
 .../inventories/geogateway-dev/group_vars/pga/vars.yml    |  2 +-
 .../scigap/production/group_vars/pga-seagrid/vars.yml     |  4 +++-
 .../testing-0.17-scigap/group_vars/pga/vars.yml           |  2 +-
 .../testing-0.17-testdrive/group_vars/pga/vars.yml        |  2 +-
 .../inventories/testing-0.17/group_vars/pga/vars.yml      |  2 +-
 dev-tools/ansible/roles/pga/defaults/main.yml             |  3 +++
 dev-tools/ansible/roles/pga/tasks/main.yml                | 10 +++++++++-
 dev-tools/ansible/roles/pga/templates/pga_config.php.j2   |  6 +++---
 8 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
index 3e7058b..11e39f7 100644
--- a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
@@ -47,7 +47,7 @@ gateway_data_store_resource_id: "149.165.156.79_80025f37-19e4-496e-962e-d6fa75a5
 
 ## Portal related variables
 super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
index 90ac459..f024d1a 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
@@ -52,5 +52,7 @@ super_admin_portal: "false"
 admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 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"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
index 758bd43..e3a7317 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
@@ -46,7 +46,7 @@ gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b
 
 ## Portal related variables
 super_admin_portal: "true"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
index 5b5c13b..adbb9c8 100644
--- a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
@@ -45,7 +45,7 @@ gateway_data_store_resource_id: "149.165.156.148_13fd11a4-f2eb-4ba8-a2c7-0db07f9
 
 ## Portal related variables
 super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
index 5f50315..57c4ef9 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -45,7 +45,7 @@ gateway_data_store_resource_id: "149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa
 
 ## Portal related variables
 super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index aec2ea6..07f9a28 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -54,4 +54,7 @@ super_admin_portal: "true"
 admin_emails: "'sgg@iu.edu'"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "airavata12"
+portal_theme: "base"
+portal_theme_repo: ""
+portal_title: "Airavata PHP Gateway"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 8caa24b..3f4aba6 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -69,8 +69,16 @@
   template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php"
   become: yes
 
+- name: Checkout the portal theme (if a custom theme is defined)
+  git:
+   repo: "{{ portal_theme_repo }}"
+   dest: "{{ doc_root_dir }}/public/themes/{{ portal_theme }}"
+   version: "master"
+   update: yes
+  when: portal_theme_repo != ""
+
 - name: give read permissions to doc root
-  file: path="{{ doc_root_dir }}" state=directory mode=0755 recurse=yes
+  file: path="{{ doc_root_dir }}" state=directory mode=a+rX recurse=yes
   become: yes
 
 - name: give write permissions to storage dir

http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
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 aa320a7..6db651a 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -186,18 +186,18 @@ return array(
         /**
          * Set the name of theme in use here
          */
-        'theme' => 'base',
+        'theme' => '{{ portal_theme }}',
 
         /**
          * Portal title
          */
-        'portal-title' => 'Airavata PHP Gateway',
+        'portal-title' => '{{ portal_title }}',
 
         /**
          * Email address of the portal admin. Portal admin well get email notifications for
events
          * such as new user creation
          */
-        'admin-emails' => [{{ admin_emails }}],
+        'admin-emails' => {{ admin_emails }},
 
         /**
          * Email account that the portal should login to send emails


Mime
View raw message