diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
| commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
| tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /templates/vhosts/webdav/partial.erb | |
| parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
| parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) | |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'templates/vhosts/webdav/partial.erb')
| -rw-r--r-- | templates/vhosts/webdav/partial.erb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/templates/vhosts/webdav/partial.erb b/templates/vhosts/webdav/partial.erb new file mode 100644 index 0000000..d89da50 --- /dev/null +++ b/templates/vhosts/webdav/partial.erb @@ -0,0 +1,21 @@ + DAVLockDB <%= real_dav_db_dir %>/DAVLock + <Directory "<%= documentroot %>/"> + Dav on + AllowOverride None + <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> + Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless options.include?('Indexes') then -%> Indexes<%- end -%> + + <%- else -%> + Options Indexes + + <%- 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' -%> + Require ldap-user <%= ldap_user.to_s %> + <%- else -%> + Require valid-user + <%- end -%> + <%- end -%> + </Directory> |