diff options
| author | Micah <micah@riseup.net> | 2015-10-20 01:06:45 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-20 01:06:45 +0000 |
| commit | 4656fd5629b9d467ac2a2a98fb075c644c09c408 (patch) | |
| tree | 77ada18cb96da02d008efef196e5c7d265fce357 | |
| parent | 91c638f7d30243f0c5c079659bd3bd1d32a7cc7c (diff) | |
| parent | 9b18f7880aad97320cd5d118c31f04a0afc7c542 (diff) | |
Merge branch 'develop' into 'develop'
Redirect to webapp_domain instead of domain
This is needed for webapp when running on a subdomain.
See merge request !80
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 2 |
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> |