diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
| commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
| tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /templates/vhosts/webdav/partial.erb | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
| parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) | |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
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> |