diff options
author | mh <mh@immerda.ch> | 2014-04-14 22:53:49 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2014-04-14 22:53:49 +0200 |
commit | df43214cdce1f474fa11ab1c1752fdd28a2ae19e (patch) | |
tree | 46af0ba0c9f0399595111cfd300f839a85977536 /templates/vhosts/gitweb | |
parent | c0697dae3212159c54e8c2ea8eb4f1a1ae1439a3 (diff) |
an initial https connection might still end up as http on the backend. in that case we don't want to redirect
Diffstat (limited to 'templates/vhosts/gitweb')
-rw-r--r-- | templates/vhosts/gitweb/partial.erb | 6 |
1 files changed, 2 insertions, 4 deletions
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 -%> |