This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 45fbef6 Putting reverse proxy in correct VirtualHost block; simccs
deps
45fbef6 is described below
commit 45fbef6caf731f6b4bbf8d5322cabbb5d411dec5
Author: Marcus Christie <[email protected]>
AuthorDate: Mon Mar 25 10:52:30 2019 -0400
Putting reverse proxy in correct VirtualHost block; simccs deps
---
.../develop/host_vars/simccs/files/django-ssl-vhost.conf.j2 | 8 ++++----
.../ansible/inventories/scigap/develop/host_vars/simccs/vars.yml | 6 +++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
index 9f69fc5..8b749ab 100644
---
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
+++
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/files/django-ssl-vhost.conf.j2
@@ -30,10 +30,6 @@
<VirtualHost *:{{ httpd_default_http_port }}>
ServerName {{ vhost_servername }}
- # Reverse proxy to geoserver on gf8
- ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver";
- ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver";
-
## Redirect all http traffic to https
RewriteEngine On
RewriteCond %{HTTPS} off
@@ -43,6 +39,10 @@
<VirtualHost *:{{ httpd_default_https_port }}>
ServerName {{ vhost_servername }}
+ # Reverse proxy to geoserver on gf8
+ ProxyPass /geoserver "http://gf8.ucs.indiana.edu/geoserver";
+ ProxyPassReverse /geoserver "http://gf8.ucs.indiana.edu/geoserver";
+
Alias /robots.txt {{ doc_root_dir }}/static/robots.txt
Alias /favicon.ico {{ doc_root_dir }}/static/favicon.ico
diff --git
a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 822cc15..0a8b4e0 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -20,8 +20,12 @@
---
airavata_django_extra_dependencies:
- - git+https://github.com/SciGaP/simccs-maptool.git#egg=simccs-maptool
+ # 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
- pyjnius
doc_root_dir: "/data/portals/django-simccs"
vhost_servername: "beta.simccs.org"
