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/itk_plus | |
| parent | d4a70a927e41c181aa07d467a2478db74439aadb (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/vhosts/itk_plus')
| -rw-r--r-- | templates/vhosts/itk_plus/partial.erb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/templates/vhosts/itk_plus/partial.erb b/templates/vhosts/itk_plus/partial.erb index 39aa6c8..78e8d27 100644 --- a/templates/vhosts/itk_plus/partial.erb +++ b/templates/vhosts/itk_plus/partial.erb @@ -4,25 +4,25 @@ <% if vhost_part == :ssl -%> SSLProxyEngine On <% if run_mode.to_s == 'static-itk' -%> - ProxyPassMatch ^/(.*\.<%= passing_extension %>/?.*)$ https://127.0.0.1/$1 + ProxyPassMatch ^/(.*\.<%= @passing_extension %>/?.*)$ https://127.0.0.1/$1 <% else -%> ProxyPass / https://127.0.0.1/ <% end -%> ProxyPassReverse / https://127.0.0.1/ <% else -%> <% if run_mode.to_s == 'static-itk' -%> - ProxyPassMatch ^/(.*\.<%= passing_extension %>/?.*)$ http://127.0.0.1/$1 + ProxyPassMatch ^/(.*\.<%= @passing_extension %>/?.*)$ http://127.0.0.1/$1 <% else -%> ProxyPass / http://127.0.0.1/ <% end -%> ProxyPassReverse / http://127.0.0.1/ <% end -%> -<% if run_mode.to_s == 'static-itk' && (ssl_mode.to_s != 'force' || vhost_part == :ssl) -%> - <Directory "<%= documentroot %>/"> - AllowOverride <%= allow_override %> -<% 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' and not options.include?('+Includes') -%> +Includes<% end -%> +<% if @run_mode.to_s == 'static-itk' && (@ssl_mode.to_s != 'force' || vhost_part == :ssl) -%> + <Directory "<%= @documentroot %>/"> + AllowOverride <%= @allow_override %> +<% 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 -%> <% end -%> <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> |