summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-04-01 15:21:33 +0000
committerMicah <micah@riseup.net>2015-04-01 15:21:33 +0000
commitfa65eb1194bd54a6c17b477f983f19fe87943149 (patch)
treea97309726b555a70d4c7c4c889a8dc6c024b8617 /puppet
parent5398a55d0b7b60a321b08454885134e3297311b3 (diff)
parent252bb2121c87a2c650551fc306f7ee41c17e8d9f (diff)
Merge branch 'develop' into 'develop'
Adds apache support for webapp.domain if defined on :80, completes fix for #6632 See merge request !38
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/common.conf.erb5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
index 87c40005..43bd1076 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
@@ -1,5 +1,7 @@
<VirtualHost *:80>
- ServerName <%= domain %>
+ ServerName <%= webapp_domain %>
+ ServerAlias <%= domain_name %>
+ ServerAlias <%= domain %>
ServerAlias www.<%= domain %>
RewriteEngine On
RewriteRule ^.*$ https://<%= domain -%>%{REQUEST_URI} [R=permanent,L]
@@ -7,7 +9,6 @@
</VirtualHost>
<VirtualHost *:443>
-
ServerName <%= webapp_domain %>
ServerAlias <%= domain_name %>
ServerAlias <%= domain %>