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 2018/08/16 17:28:08 UTC
[airavata] branch master updated: Adding redirect for simccs.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 ad4221d Adding redirect for simccs.org
ad4221d is described below
commit ad4221d79fef6d2da6c52491ac92030ccc17bb7d
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Aug 16 13:28:00 2018 -0400
Adding redirect for simccs.org
---
.../inventories/scigap/production/pga_config/iugeosurvey/vars.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
index 164ce7c..400de06 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
@@ -25,6 +25,7 @@ user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
vhost_servername: "simccs.org"
+vhost_server_redirect: "geosurveyiu.scigap.org"
vhost_ssl: true
# TODO: have Ansible manage these files as well
ssl_certificate_file: "/etc/letsencrypt/live/simccs.org/cert.pem"
diff --git a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
index 7d0ba1a..368a988 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
@@ -3,6 +3,10 @@
ServerName {{ vhost_server_redirect }}
Redirect "/" "https://{{ vhost_servername }}"
</VirtualHost>
+<VirtualHost *:{{pga_default_https_port}}>
+ ServerName {{ vhost_server_redirect }}
+ Redirect "/" "https://{{ vhost_servername }}"
+</VirtualHost>
{% endif %}
<VirtualHost *:{{pga_default_http_port}}>