diff options
author | mh <mh@immerda.ch> | 2011-05-17 23:30:11 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-05-17 23:30:11 +0200 |
commit | 09feb96edeaff10bde462aabb8c4d0c961eadd1a (patch) | |
tree | 07961b935baa987c667b5a217d7c067591b0ed31 /templates/vhosts/webdav | |
parent | e6819524ebf02302d05d74d8c92f4c3dd90c06b4 (diff) |
migrate authentication to partials
Diffstat (limited to 'templates/vhosts/webdav')
-rw-r--r-- | templates/vhosts/webdav/webdav.erb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb index 30d76e3..eb12e36 100644 --- a/templates/vhosts/webdav/webdav.erb +++ b/templates/vhosts/webdav/webdav.erb @@ -45,12 +45,7 @@ Options Indexes <%- end -%> - <%- unless htpasswd_file.to_s == 'absent' then -%> - AuthType Basic - AuthName "Access fuer <%= servername %>" - AuthUserFile <%= real_htpasswd_path %> - require valid-user - <%- end -%> +<%= scope.function_template('apache/vhosts/partials/authentication.erb') %> <%- if ldap_auth.to_s == 'true' then -%> Include include.d/ldap_auth.inc <%- unless ldap_user.to_s == 'any' -%> @@ -111,12 +106,7 @@ Options Indexes <%- end -%> - <%- unless htpasswd_file.to_s == 'absent' then -%> - AuthType Basic - AuthName "Access fuer <%= servername %>" - AuthUserFile <%= real_htpasswd_path %> - require valid-user - <%- end -%> +<%= scope.function_template('apache/vhosts/partials/authentication.erb') %> <%- if ldap_auth.to_s == 'true' then -%> Include include.d/ldap_auth.inc <%- unless ldap_user.to_s == 'any' -%> |