summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguido <guido@dis.tur.bio>2015-10-19 15:07:30 -0300
committerguido <guido@dis.tur.bio>2015-10-19 15:07:30 -0300
commit9b18f7880aad97320cd5d118c31f04a0afc7c542 (patch)
treeb98c46b28396c469d60232b54050c411f7f20c07
parent2c8de729a2a4213b8cb312bcb481695ae44f9a62 (diff)
Redirect to webapp_domain instead of domain
This is needed for webapp when running on a subdomain.
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/common.conf.erb2
1 files changed, 1 insertions, 1 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 ee5cd707..7f9fd5ab 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
@@ -4,7 +4,7 @@
ServerAlias <%= domain %>
ServerAlias www.<%= domain %>
RewriteEngine On
- RewriteRule ^.*$ https://<%= domain -%>%{REQUEST_URI} [R=permanent,L]
+ RewriteRule ^.*$ https://<%= webapp_domain -%>%{REQUEST_URI} [R=permanent,L]
CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common
</VirtualHost>