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/webdav | |
| parent | d4a70a927e41c181aa07d467a2478db74439aadb (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/vhosts/webdav')
| -rw-r--r-- | templates/vhosts/webdav/partial.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/templates/vhosts/webdav/partial.erb b/templates/vhosts/webdav/partial.erb index b97e128..09ce632 100644 --- a/templates/vhosts/webdav/partial.erb +++ b/templates/vhosts/webdav/partial.erb @@ -1,16 +1,16 @@ - DAVLockDB <%= real_dav_db_dir %>/DAVLock - <Directory "<%= documentroot %>/"> + DAVLockDB <%= @real_dav_db_dir %>/DAVLock + <Directory "<%= @documentroot %>/"> Dav on AllowOverride None -<% if options.to_s != 'absent' or do_includes.to_s == 'true' -%> - Options <%- unless options.to_s == 'absent' -%><%= options %><%- end -%><%- unless options.include?('Indexes') -%> Indexes<%- end -%> +<% if @options.to_s != 'absent' || @do_includes.to_s == 'true' -%> + Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% unless @options.include?('Indexes') -%> Indexes<%- end -%> <% else -%> Options Indexes <% end -%> <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> -<% if ldap_auth.to_s == 'true' then -%> +<% if @ldap_auth.to_s == 'true' then -%> Include include.d/ldap_auth.inc <% unless ldap_user.to_s == 'any' -%> Require ldap-user <%= ldap_user.to_s %> |