airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [2/3] airavata git commit: Updating production pga configs for beta deploys
Date Wed, 05 Jul 2017 13:11:23 GMT
Updating production pga configs for beta deploys


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

Branch: refs/heads/keycloak-prod-migration
Commit: 70fd7b1b2f40b9f7a185f0c3ef9b66c5e7a113a3
Parents: fc09a35
Author: Marcus Christie <machristie@apache.org>
Authored: Tue Jul 4 21:02:10 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue Jul 4 21:02:10 2017 -0400

----------------------------------------------------------------------
 .../production/pga_config/scigap/vars.yml       | 14 ++++++----
 .../production/pga_config/seagrid/vars.yml      |  4 +--
 .../production/pga_config/testdrive/vars.yml    | 18 ++++++++-----
 dev-tools/ansible/pga-scigap-prod.yml           | 28 ++++++++++----------
 4 files changed, 36 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/70fd7b1b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 1f01bed..ca65ac7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -20,16 +20,20 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/scigap"
-vhost_servername: "scigap.org"
+#vhost_servername: "scigap.org"
+vhost_servername: "beta.scigap.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
+#ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
+#ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
+#ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
+ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"

http://git-wip-us.apache.org/repos/asf/airavata/blob/70fd7b1b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 57c143b..2c8bc41 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -20,7 +20,7 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
@@ -50,7 +50,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/70fd7b1b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index cc96188..4c96e50 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -20,17 +20,21 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/testdrive"
-vhost_servername: "testdrive.airavata.org"
-vhost_serveralias: "www.testdrive.airavata.org"
+#vhost_servername: "testdrive.airavata.org"
+#vhost_serveralias: "www.testdrive.airavata.org"
+vhost_servername: "beta.testdrive.airavata.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+#ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
+#ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
+#ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+ssl_certificate_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
@@ -45,7 +49,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/70fd7b1b/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 2299757..76b4147 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,22 +19,22 @@
 #
 
 ---
-- 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/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/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/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/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/ultrascan"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
 
 ...


Mime
View raw message