[airavata] 01/02: Ansible: use default ports for rpid, letsencrypt cert

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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

commit 5c18f0a8261a3381421fc80dec958100bb77dda5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 4 16:30:22 2020 -0500

    Ansible: use default ports for rpid, letsencrypt cert
---
 .../inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml        | 4 ++--
 .../inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml        | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml
index aa47d07..52286b6 100644
--- a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml
@@ -128,8 +128,8 @@ airavata_port: "9930"
 airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
 auth_verify_peer: "false"
 oauth_service_url: "{{ iam_server_url }}"
-pga_default_http_port: 8008
-pga_default_https_port: 8443
+# pga_default_http_port: 8008
+# pga_default_https_port: 8443
 
 # Sharing Registry related variables
 sharing_registry_host: "{{ groups['api-orch'][0] }}"
diff --git a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml
index 91aa6d6..4c8676f 100644
--- a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml
@@ -33,10 +33,9 @@ vhost_servername: "rpid.scigap.seagrid.org"
 #vhost_serveralias: "CHANGEME"
 # Enable and change the following to enable SSL
 vhost_ssl: True
-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"
-pga_vhost_template: "{{ inventory_dir }}/templates/pga-vhost.conf.j2"
+ssl_certificate_file: "/etc/letsencrypt/live/rpid.scigap.seagrid.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/rpid.scigap.seagrid.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/rpid.scigap.seagrid.org/privkey.pem"
 
 
 ## Keycloak related variables