diff options
| author | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
| commit | 41d778fe47c20f2d4c37b4c3089d50fbac6535a3 (patch) | |
| tree | 7d88ed6ca5e7b1733204f624fef6d3ce92750a4c /templates/vhosts/partials/std_override_options.erb | |
| parent | d4a70a927e41c181aa07d467a2478db74439aadb (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/vhosts/partials/std_override_options.erb')
| -rw-r--r-- | templates/vhosts/partials/std_override_options.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb index f35354d..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 -%> + 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 -%> |