From commits-return-19594-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Thu Aug 16 19:28:10 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 45A5E180675 for ; Thu, 16 Aug 2018 19:28:10 +0200 (CEST) Received: (qmail 98165 invoked by uid 500); 16 Aug 2018 17:28:09 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 98156 invoked by uid 99); 16 Aug 2018 17:28:09 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2018 17:28:09 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C088088BF0; Thu, 16 Aug 2018 17:28:08 +0000 (UTC) Date: Thu, 16 Aug 2018 17:28:08 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch master updated: Adding redirect for simccs.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153444048872.29689.8316750080156040568@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f5a051d5be1a61fdb7de1df23044b3805c129a66 X-Git-Newrev: ad4221d79fef6d2da6c52491ac92030ccc17bb7d X-Git-Rev: ad4221d79fef6d2da6c52491ac92030ccc17bb7d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 }}" + + ServerName {{ vhost_server_redirect }} + Redirect "/" "https://{{ vhost_servername }}" + {% endif %}