[airavata] branch master updated: Ansible: deploy dev maptool branch to simccs.org

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1ec128a  Ansible: deploy dev maptool branch to simccs.org
1ec128a is described below

commit 1ec128abd532412fbda357aee26681a7d58358c4
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Feb 18 15:15:49 2020 -0500

    Ansible: deploy dev maptool branch to simccs.org
---
 .../inventories/scigap/production/group_vars/django/vars.yml   |  2 +-
 .../production/host_vars/simccs/files/django-ssl-vhost.conf.j2 |  1 +
 .../inventories/scigap/production/host_vars/simccs/vars.yml    | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
index 8ae8991..18d35f3 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
@@ -23,7 +23,7 @@ user: "pga"
 group: "pga"
 gateway_data_store_hostname: "gf4.ucs.indiana.edu"
 gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-django_wsgi_processes: 2
+django_wsgi_processes: 1
 doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
 django_database_name: "django_{{ inventory_hostname }}"
 django_hidden_airavata_apps: "['django_airavata_dataparsers']"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
index b6be6da..6090cd1 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -38,6 +38,7 @@
 
 <VirtualHost *:{{ httpd_default_https_port }}>
     ServerName {{ vhost_servername }}
+    TimeOut {{ vhost_timeout }}
 
     # Reverse proxy to geoserver on gf8
     ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver"
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
index 5f14382..5a20622 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
@@ -25,14 +25,15 @@ gateway_data_store_hostname: "scigap11.sciencegateways.iu.edu"
 gateway_data_store_resource_id: "scigap11.sciencegateways.iu.edu_96b8dcec-ac84-438a-9927-91baaf87758b"
 
 django_tus_endpoint: "https://tus.simccs.scigap.org/files/"
-
+# simccs_maptool_branch: "master"
+simccs_maptool_branch: "dev"
 airavata_django_extra_dependencies:
   # Need to separately install cython in the VM or do two deploys, one with
   # just cython, then a second with the other dependencies. Reason: pyjnius
   # requires that cython already be installed and they can't both be installed
   # at the same time.
   - cython
-  - git+https://github.com/SciGaP/simccs-maptool.git#egg=simccs-maptool
+  - "git+https://github.com/SciGaP/simccs-maptool.git@{{ simccs_maptool_branch }}#egg=simccs-maptool"
   - pyjnius
 
 django_extra_settings:
@@ -40,12 +41,17 @@ django_extra_settings:
   MAPTOOL_SETTINGS:
     CPLEX_APPLICATION_ID: "cplex-solver_99721933-c9e4-4285-9ef1-d035ca82b541"
     DATASETS_DIR: "/data/gateway-user-data/simccs-datasets"
+    JAVA_OPTIONS: "-Xmx12g"
 
 vhost_servername: "simccs.org"
 vhost_ssl: true
+# Some of the maptool views call into Java code and can take 2-3 minutes to execute
+vhost_timeout: 300
 ssl_certificate_file: "/etc/letsencrypt/live/simccs.org/cert.pem"
 ssl_certificate_chain_file: "/etc/letsencrypt/live/simccs.org/fullchain.pem"
 ssl_certificate_key_file: "/etc/letsencrypt/live/simccs.org/privkey.pem"
+# Custom vhost config file to specify the geoserver reverse proxy
+django_ssl_vhost_template: "{{ inventory_dir }}/host_vars/simccs/files/django-ssl-vhost.conf.j2"
 
 ## Keycloak related variables
 tenant_domain: "iu-geology-survey"