From df43214cdce1f474fa11ab1c1752fdd28a2ae19e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 14 Apr 2014 22:53:49 +0200
Subject: an initial https connection might still end up as http on the
 backend. in that case we don't want to redirect

---
 templates/vhosts/gitweb/partial.erb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'templates/vhosts/gitweb')

diff --git a/templates/vhosts/gitweb/partial.erb b/templates/vhosts/gitweb/partial.erb
index 7238ebe..c04f1c3 100644
--- a/templates/vhosts/gitweb/partial.erb
+++ b/templates/vhosts/gitweb/partial.erb
@@ -1,10 +1,9 @@
-    <% unless ssl_mode.to_s == 'force' -%>
     SetEnv GITWEB_CONFIG <%= gitweb_config %>
     DirectoryIndex gitweb.cgi
     <Directory "<%= documentroot %>/">
-        <% if options.to_s != 'absent' or do_includes.to_s == 'true'-%>
+<% if options.to_s != 'absent' || do_includes.to_s == 'true'-%>
         Options <% unless options.to_s == 'absent' -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% unless options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
-        <% end -%>
+<% end -%>
 
         AddHandler cgi-script .cgi
         <Files gitweb.cgi>
@@ -16,4 +15,3 @@
 
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
     </Directory>
-    <% end -%>
-- 
cgit v1.2.3