From c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 19 Dec 2012 12:12:16 -0800
Subject: webapp api now uses a customizable port (so that we don't try to rely
 on SNI for hosting two TLS domains on one IP).

---
 puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_apache/templates')

diff --git a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
index 05d5f69d..cdfcbd68 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
@@ -1,10 +1,12 @@
 <VirtualHost *:80>
   ServerName <%= api_domain %>
   RewriteEngine On
-  RewriteRule ^.*$ https://<%= api_domain -%>%{REQUEST_URI} [R=permanent,L]
+  RewriteRule ^.*$ https://<%= api_domain -%>:<%= api_port -%>%{REQUEST_URI} [R=permanent,L]
 </VirtualHost>
 
-<VirtualHost *:443>
+Listen 0.0.0.0:<%= api_port %>
+
+<VirtualHost *:<%= api_port -%>>
   ServerName <%= api_domain %>
 
   SSLEngine on
-- 
cgit v1.2.3