summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-12-19 12:12:16 -0800
committerelijah <elijah@riseup.net>2012-12-19 12:12:16 -0800
commitc3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba (patch)
tree87a6e1ed0f61fe90fb6b089d695f6de897119128 /puppet/modules/site_apache
parent109334ec46ffdde3a96119fd6108080bd1d45c8a (diff)
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).
Diffstat (limited to 'puppet/modules/site_apache')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/api.conf.erb6
1 files changed, 4 insertions, 2 deletions
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