airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [29/50] [abbrv] airavata git commit: Update PGA configs for production
Date Fri, 28 Apr 2017 15:23:10 GMT
Update PGA configs for production


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

Branch: refs/heads/develop
Commit: 00efec7ec967a6a7b0e89fa7fec5d58c91e2e72e
Parents: af6ca9a
Author: Marcus Christie <machristie@apache.org>
Authored: Tue Apr 25 11:20:40 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400

----------------------------------------------------------------------
 .../scigap/production/pga_config/scigap/vars.yml     | 12 ++++--------
 .../scigap/production/pga_config/seagrid/vars.yml    | 15 +++++----------
 .../scigap/production/pga_config/testdrive/vars.yml  | 14 +++++---------
 3 files changed, 14 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/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 9822f96..40e8e52 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
@@ -24,16 +24,12 @@ git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/scigap"
-#vhost_servername: "scigap.org"
-vhost_servername: "beta.scigap.org"
+vhost_servername: "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/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"
+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"
 
 ## WSO2 IS related variables
 tenant_domain: ""

http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/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 60e7cc6..fef5599 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
@@ -24,18 +24,13 @@ git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-# TODO: disable SSL temporarily for testing
-#vhost_servername: "seagrid.org"
-#vhost_serveralias: "www.portal.seagrid.org"
-vhost_servername: "beta.seagrid.org"
+vhost_servername: "seagrid.org"
+vhost_serveralias: "www.seagrid.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
 
 ## WSO2 IS related variables
 tenant_domain: "prod.seagrid"

http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/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 2ce43c1..0b6b715 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
@@ -24,17 +24,13 @@ git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/testdrive"
-#vhost_servername: "testdrive.airavata.org"
-#vhost_serveralias: "www.testdrive.airavata.org"
-vhost_servername: "beta.testdrive.airavata.org"
+vhost_servername: "testdrive.airavata.org"
+vhost_serveralias: "www.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/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"
+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"
 
 ## WSO2 IS related variables
 tenant_domain: "prod.testdrive"


Mime
View raw message