Skip to content

Commit

Permalink
MODULES-1784 check for deprecated options and fail when they are unsu…
Browse files Browse the repository at this point in the history
…pported
  • Loading branch information
roman-mueller committed Feb 20, 2015
1 parent 85b91f0 commit 669b303
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions templates/vhost/_directories.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

## Directories, there should at least be a declaration for <%= @docroot %>
<%- [@_directories].flatten.compact.each do |directory| -%>
<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
<%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
<%- scope.function_fail(["Apache::Vhost: Using allow is not supported in your Apache version"]) -%>
<%- end -%>
<%- if directory['deny'] and ! [ false, 'false', '' ].include?(directory['deny']) -%>
<%- scope.function_fail(["Apache::Vhost: Using deny is not supported in your Apache version"]) -%>
<%- end -%>
<%- if directory['order'] and ! [ false, 'false', '' ].include?(directory['order']) -%>
<%- scope.function_fail(["Apache::Vhost: Using order is not supported in your Apache version"]) -%>
<%- end -%>
<%- if directory['satisfy'] and ! [ false, 'false', '' ].include?(directory['satisfy']) -%>
<%- scope.function_fail(["Apache::Vhost: Using satisfy is not supported in your Apache version"]) -%>
<%- end -%>
<%- end -%>
<%- if directory['path'] and directory['path'] != '' -%>
<%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
<%- if /^(.*)match$/ =~ directory['provider'] -%>
Expand Down

0 comments on commit 669b303

Please sign in to comment.