diff options
| author | mh <mh@immerda.ch> | 2011-10-09 01:13:47 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-10-09 01:13:47 +0200 |
| commit | 7a2bc42c1ae63b08f90825446f51ee626b8a5f27 (patch) | |
| tree | ca68631970af15c74b66c856e8e89268bff17b4a /templates | |
| parent | d2b1d040b9225b8ae077e3babd9a2f4d5b9dd4e8 (diff) | |
ensure that execcgi is passed and add extension index
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/partials/header_default.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/partials/std_override_options.erb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb index eff83cf..1c9309d 100644 --- a/templates/vhosts/partials/header_default.erb +++ b/templates/vhosts/partials/header_default.erb @@ -14,4 +14,7 @@ <% end -%> <% if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> +<% end -%> +<% unless passed_extension.to_s.empty? -%> + DirectoryIndex index.htm index.html index.<%= passed_extension %> <% end -%>
\ No newline at end of file diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb index 845fcc0..6be9ff1 100644 --- a/templates/vhosts/partials/std_override_options.erb +++ b/templates/vhosts/partials/std_override_options.erb @@ -1,4 +1,4 @@ AllowOverride <%= allow_override %> - <% if options.to_s != 'absent' || do_includes.to_s == 'true' -%> + <% if options.to_s != 'absent' || do_includes.to_s == 'true' || run_mode == 'fcgid' -%> Options <%- unless options.to_s == 'absent' then -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% if run_mode == 'fcgid' && !options.include?('+ExecCGI') -%>+ExecCGI<% end -%> <% end -%>
\ No newline at end of file |