diff options
| author | elijah <elijah@riseup.net> | 2015-04-01 14:25:14 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-04-01 14:25:14 -0700 |
| commit | 63a32dc933242bafef15aa2e61baa04bf5b7f38f (patch) | |
| tree | ccf53abb56a9dd43ea51c4d3227a8702b139ed5f | |
| parent | a434d299225d4dfe6b2ef23859ab8d573e9a7575 (diff) | |
| parent | e2e6111097b60255d985a499531c38097009b700 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 5 |
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 %> |