summaryrefslogtreecommitdiff
path: root/templates/vhosts/passenger
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-10-25 22:58:24 +0200
committermh <mh@immerda.ch>2010-10-25 22:58:24 +0200
commita4358a825de159a145b877c7b7d7c795c72cb3b4 (patch)
tree3f9f0638c5834a3883c0b264995fb4bb8cba47e8 /templates/vhosts/passenger
parent8d9291378001e8b0471895b084387261b730cdac (diff)
improve redirect, so we don't stick on the servername
Diffstat (limited to 'templates/vhosts/passenger')
-rw-r--r--templates/vhosts/passenger/passenger.erb5
1 files changed, 4 insertions, 1 deletions
diff --git a/templates/vhosts/passenger/passenger.erb b/templates/vhosts/passenger/passenger.erb
index c2198c3..fd9f555 100644
--- a/templates/vhosts/passenger/passenger.erb
+++ b/templates/vhosts/passenger/passenger.erb
@@ -27,7 +27,10 @@
CustomLog <%= logdir %>/access_log combined
<%- end -%>
<%- if ssl_mode.to_s == 'force' then -%>
- Redirect permanent / https://<%= servername %>/
+ RewriteEngine On
+ RewriteCond %{HTTPS} !=on
+ RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
+
<%- end -%>
<%- if default_charset.to_s != 'absent' then -%>
AddDefaultCharset <%= default_charset %>