From a4358a825de159a145b877c7b7d7c795c72cb3b4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 25 Oct 2010 22:58:24 +0200
Subject: improve redirect, so we don't stick on the servername

---
 templates/vhosts/passenger/passenger.erb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'templates/vhosts/passenger')

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 %>
-- 
cgit v1.2.3