Repository: airavata Updated Branches: refs/heads/develop 101a687a1 -> d03c72402
Ci Logon integration Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d03c7240 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d03c7240 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d03c7240 Branch: refs/heads/develop Commit: d03c724029a0fd9203b4ee2404c38cc87f55baf4 Parents: 101a687 Author: Suresh Marru <[email protected]> Authored: Tue Jul 11 12:04:10 2017 -0500 Committer: Suresh Marru <[email protected]> Committed: Tue Jul 11 12:04:10 2017 -0500 ---------------------------------------------------------------------- .../production/pga_config/accord/vars.yml | 4 +-- .../production/pga_config/georgiastate/vars.yml | 8 +++-- .../production/pga_config/oiitandy/vars.yml | 4 +++ .../scigap/production/pga_config/oscer/vars.yml | 2 +- .../production/pga_config/phasta/vars.yml | 4 +++ .../production/pga_config/southdakota/vars.yml | 4 +++ .../pga_config/southernillinois/vars.yml | 8 +++-- .../scigap/production/pga_config/utah/vars.yml | 8 +++-- dev-tools/ansible/pga-scigap-prod.yml | 36 ++++++++++---------- 9 files changed, 51 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml index b598828..4e916d8 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml @@ -23,7 +23,7 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"; git_branch: "develop" user: "pga" group: "pga" -doc_root_dir: "/var/www/portals/testdrive" +doc_root_dir: "/var/www/portals/accord" vhost_servername: "accord.hpc.virginia.edu" vhost_serveralias: "www.accord.hpc.virginia.edu" vhost_ssl: True @@ -51,7 +51,7 @@ oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "virginaaccord" # relative to document root dir -experiment_data_dir: "{{ user_data_dir }}/testdrive" +experiment_data_dir: "{{ user_data_dir }}/accord" gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6" gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn" http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml index 1e37084..754c1f7 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml @@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}" oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration" auth_options: - - name: "Georgia State PHP Gateway" + - name: "Georgia State Science Gateway" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "georgiastate" @@ -57,5 +61,5 @@ portal_email_username: "[email protected]" portal_email_password: "{{ vault_portal_email_password }}" portal_theme: "gsu-gateway-theme" portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"; -portal_title: "Georgia State PHP Gateway" +portal_title: "Georgia State Science Gateway" ... http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml index 5c27e53..577e5fb 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml @@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel auth_options: - name: "OII Science Gateway" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "oiitandy" http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml index 8d5ebf7..bae599e 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml @@ -44,7 +44,7 @@ auth_options: oauth_grant_type: "password" - name: "CILogon" oauth_grant_type: "authorization_code" - oauth_authorize_url_extra_params: "kc_idp_hint=oidc" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml index b332339..48a1cca 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml @@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel auth_options: - name: "PHASTA" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "phasta" http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml index b9cbed9..225843f 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml @@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel auth_options: - name: "South Dakota Sciencegateway" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "southdakota" http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml index 10c86e6..d2d9423 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml @@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}" oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration" auth_options: - - name: "Southern Illinois PHP Gateway" + - name: "Southern Illinois Science Gateway" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "southill" @@ -57,5 +61,5 @@ portal_email_username: "[email protected]" portal_email_password: "{{ vault_portal_email_password }}" portal_theme: "siu-gateway-theme" portal_theme_repo: "https://github.com/SciGaP/siu-gateway-theme.git"; -portal_title: "Southern Illinois PHP Gateway" +portal_title: "Southern Illinois Science Gateway" ... http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml index 6608485..eb2bad8 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml @@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}" oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration" auth_options: - - name: "Utah Gateway" + - name: "Utah Science Gateway" oauth_grant_type: "password" + - name: "CILogon" + oauth_grant_type: "authorization_code" + oauth_authorize_url_extra_params: "kc_idp_hint=cilogon" + logo: "/assets/cilogon-logo-24x24-b.png" oauth_callback_url: "https://{{ vhost_servername }}/callback-url" gateway_id: "utah" @@ -57,5 +61,5 @@ portal_email_username: "[email protected]" portal_email_password: "{{ vault_portal_email_password }}" portal_theme: "utah-sciencegateway-theme" portal_theme_repo: "https://github.com/SciGaP/utah-sciencegateway-theme.git"; -portal_title: "Utah Gateway" +portal_title: "Utah Science Gateway" ... http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/pga-scigap-prod.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml index b831f8e..441ad00 100644 --- a/dev-tools/ansible/pga-scigap-prod.yml +++ b/dev-tools/ansible/pga-scigap-prod.yml @@ -19,24 +19,24 @@ # --- -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu" - include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan" -#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan" +- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah" ...
