You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/02/05 22:48:31 UTC
[airavata] branch RPID+SEAGrid updated (7e13c3e -> ca44706)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch RPID+SEAGrid
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 7e13c3e Committing changes to RPID+SEAGrid gateway
new 5c18f0a Ansible: use default ports for rpid, letsencrypt cert
new ca44706 Ansible: fix addresses of internally accessed services
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml | 10 +++++-----
.../inventories/scigap/RPID+SEAGrid/group_vars/pga/vars.yml | 7 +++----
2 files changed, 8 insertions(+), 9 deletions(-)
[airavata] 01/02: Ansible: use default ports for rpid,
letsencrypt cert
Posted by 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
[airavata] 02/02: Ansible: fix addresses of internally accessed
services
Posted by 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 ca44706fb550f879e19bc9145b7638ddcd6e9052
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Feb 5 17:47:44 2020 -0500
Ansible: fix addresses of internally accessed services
---
.../ansible/inventories/scigap/RPID+SEAGrid/group_vars/all/vars.yml | 6 +++---
1 file changed, 3 insertions(+), 3 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 52286b6..48e3e15 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
@@ -60,7 +60,7 @@ django_db_password: "{{ vault_db_password }}"
mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
# Rabbitmq related vareables
-rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
+rabbitmq_server: "{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}"
rabbitmq_vhost: "master"
rabbitmq_user: "airavata"
rabbitmq_password: "{{ vault_rabbitmq_password }}"
@@ -123,9 +123,9 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
user_data_dir: "/data/gateway-user-data"
-airavata_server: "tls://{{ groups['api-orch'][0] }}"
+airavata_server: "tls://localhost"
airavata_port: "9930"
-airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
+airavata_profile_service_server: "localhost"
auth_verify_peer: "false"
oauth_service_url: "{{ iam_server_url }}"
# pga_default_http_port: 8008