diff options
author | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
commit | 36fd84c3d17355afa05b519764c37a3e45efc40d (patch) | |
tree | c6f5dbc4651875a147607c788b37c5c973573330 /templates/vhosts/partials/std_override_options.erb | |
parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/partials/std_override_options.erb')
-rw-r--r-- | templates/vhosts/partials/std_override_options.erb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb index 95a5e6a..6d8b74f 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' || 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 -%> + AllowOverride <%= @allow_override %> +<% if @options.to_s != 'absent' || @do_includes.to_s == 'true' || @run_mode == 'fcgid' -%> + Options <%- unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%><% if @run_mode == 'fcgid' && !@options.include?('+ExecCGI') -%> +ExecCGI<% end -%> +<% end -%> |