summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-04-01 11:24:34 -0400
committerMicah Anderson <micah@leap.se>2015-04-01 11:24:34 -0400
commite2e6111097b60255d985a499531c38097009b700 (patch)
tree2bb2556ca4b524b96d90dfd05c834784a3b88450 /puppet/modules/site_apache
parent1f3a09047dbc0b411fc78233301f8440957ee6b8 (diff)
parentfa65eb1194bd54a6c17b477f983f19fe87943149 (diff)
Merge remote-tracking branch 'gitlab/develop' into develop
Diffstat (limited to 'puppet/modules/site_apache')
-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 %>