diff options
| author | mh <mh@immerda.ch> | 2012-06-06 01:25:24 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-06 01:25:24 -0300 |
| commit | edc2afe65136d49501b6aaeb805269b3f7bb141f (patch) | |
| tree | 67693910c04d1c212dae25daf9bac1a4952df3f7 /templates | |
| parent | 65f6bb2025218692949530db6703792cc6865c02 (diff) | |
fix for new style for 2.7
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/gitweb/partial.erb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/templates/vhosts/gitweb/partial.erb b/templates/vhosts/gitweb/partial.erb index 593aaff..8bfe6ce 100644 --- a/templates/vhosts/gitweb/partial.erb +++ b/templates/vhosts/gitweb/partial.erb @@ -1,10 +1,10 @@ + <% unless ssl_mode.to_s == 'force' -%> SetEnv GITWEB_CONFIG <%= gitweb_config %> DirectoryIndex gitweb.cgi - <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> - <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> - Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%><%- unless options.include?('+ExecCGI') then -%> +ExecCGI<%- end -%> - <%- end -%> + <% if options.to_s != 'absent' or 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 -%> AddHandler cgi-script .cgi <Files gitweb.cgi> @@ -15,4 +15,5 @@ RewriteRule ^[a-zA-Z0-9_-]+.git/?(\?.)?$ /gitweb.cgi%{REQUESTURI} [L,PT] <%= scope.function_template('apache/vhosts/partials/authentication.erb') %> - </Directory>
\ No newline at end of file + </Directory> + <% end -%> |