From d2c4bdf792815f0a0f54d717bdec619f03d984ab Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 23 Dec 2009 16:06:45 -0500 Subject: introduce config::global for global configs in conf.d and config::include for vhost snippets in include.d --- templates/vhosts/webdav/webdav.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'templates/vhosts/webdav') diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb index bf4f2d2..671ff58 100644 --- a/templates/vhosts/webdav/webdav.erb +++ b/templates/vhosts/webdav/webdav.erb @@ -1,7 +1,7 @@ # <%= servername %> <%- unless ssl_mode.to_s == 'only' then -%> - Include conf.d/defaults.inc + Include include.d/defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> @@ -43,7 +43,7 @@ require valid-user <%- end -%> <%- if ldap_auth.to_s == 'true' then -%> - Include conf.d/ldap_auth.inc + Include include.d/ldap_auth.inc <%- unless ldap_user.to_s == 'any' -%> Require ldap-user <%= ldap_user.to_s %> <%- else -%> @@ -75,8 +75,8 @@ <%- unless ssl_mode.to_s == 'false' then -%> - Include conf.d/defaults.inc - Include conf.d/ssl_defaults.inc + Include include.d/defaults.inc + Include include.d/ssl_defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> @@ -117,7 +117,7 @@ require valid-user <%- end -%> <%- if ldap_auth.to_s == 'true' then -%> - Include conf.d/ldap_auth.inc + Include include.d/ldap_auth.inc <%- unless ldap_user.to_s == 'any' -%> Require ldap-user <%= ldap_user.to_s %> <%- else -%> -- cgit v1.2.3