You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2020/01/30 18:17:46 UTC
[airavata] branch RPID+SEAGrid updated: Committing changes to
RPID+SEAGrid gateway
This is an automated email from the ASF dual-hosted git repository.
eroma pushed a commit to branch RPID+SEAGrid
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/RPID+SEAGrid by this push:
new 76b2f6d Committing changes to RPID+SEAGrid gateway
76b2f6d is described below
commit 76b2f6d97c4048eaf6f8deafbeb3fd71984bbd87
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Thu Jan 30 13:17:32 2020 -0500
Committing changes to RPID+SEAGrid gateway
---
.../scigap/RPID+SEAGrid/group_vars/all/vars.yml | 5 ++++-
.../ansible/inventories/scigap/RPID+SEAGrid/hosts | 3 +++
.../RPID+SEAGrid/templates/pga-vhost.conf.j2 | 26 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 1 deletion(-)
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 f221227..8e90516 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
@@ -35,7 +35,7 @@ user_home: "/home/{{ user }}"
deployment_dir: "{{ user_home }}/RPID-SEAGrid-deployment"
airavata_source_dir: "{{ user_home }}/RPID-SEAGrid-source"
airavata_repo: "https://github.com/apache/airavata.git"
-airavata_dist: "apache-airavata-server-0.19-SNAPSHOT"
+airavata_dist: "apache-airavata-api-server-0.19-SNAPSHOT"
airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
old_airavata_dist: "apache-airavata-server-0.19-SNAPSHOT"
git_branch: "RPID+SEAGrid"
@@ -54,6 +54,9 @@ workflow_catalog: "workflow_catalog"
credential_store: "credential_store"
profile_service: "profile_service"
+django_db_username: "django"
+django_db_password: "{{ vault_db_password }}"
+
mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
# Rabbitmq related vareables
diff --git a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/hosts b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/hosts
index f76716e..f5f3e42 100644
--- a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/hosts
+++ b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/hosts
@@ -17,6 +17,9 @@
[pga]
149.165.157.21 ansible_user=root
+[django]
+seagrid ansible_host=149.165.157.21 ansible_user=root
+
[keycloak]
iamdev.rpid.seagrid.org ansible_connection=ssh ansible_user=root
diff --git a/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/templates/pga-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/templates/pga-vhost.conf.j2
new file mode 100644
index 0000000..ac8cef9
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/RPID+SEAGrid/templates/pga-vhost.conf.j2
@@ -0,0 +1,26 @@
+{% if vhost_server_redirect is defined %}
+<VirtualHost *:{{pga_default_http_port}}>
+ ServerName {{ vhost_server_redirect }}
+ Redirect "/" "http://{{ vhost_servername }}"
+</VirtualHost>
+{% endif %}
+
+# Add a listen on the non-default port (8008)
+Listen {{pga_default_http_port}}
+
+<VirtualHost *:{{pga_default_http_port}}>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
+ AllowOverride All
+ php_value upload_max_filesize {{ php_upload_max_filesize }}
+ php_value post_max_size {{ php_post_max_size }}
+ </Directory>
+ ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
+ CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
+
+</VirtualHost>