diff options
| -rw-r--r-- | manifests/vhost/proxy.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/redirect.pp | 2 | ||||
| -rw-r--r-- | templates/vhosts/partials/header_default.erb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp index dfc6a0b..5783b1f 100644 --- a/manifests/vhost/proxy.pp +++ b/manifests/vhost/proxy.pp @@ -40,6 +40,8 @@ define apache::vhost::proxy( ensure => $ensure, template_mode => 'proxy', domain => $domain, + path => 'really_absent', + path_is_webdir => true, htpasswd_file => $htpasswd_file, domainalias => $domainalias, server_admin => $server_admin, diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp index 4bb7b67..9384fc0 100644 --- a/manifests/vhost/redirect.pp +++ b/manifests/vhost/redirect.pp @@ -34,6 +34,8 @@ define apache::vhost::redirect( ensure => $ensure, template_mode => 'redirect', domain => $domain, + path => 'really_absent', + path_is_webdir => true, domainalias => $domainalias, server_admin => $server_admin, logpath => $operatingsystem ? { diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb index 05b2122..eff83cf 100644 --- a/templates/vhosts/partials/header_default.erb +++ b/templates/vhosts/partials/header_default.erb @@ -9,7 +9,9 @@ <% unless server_admin.to_s.empty? || (server_admin.to_s == 'absent') -%> ServerAdmin <%= server_admin %> <% end -%> +<% unless documentroot.to_s == 'really_absent' -%> DocumentRoot <%= documentroot %>/ +<% end -%> <% if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <% end -%>
\ No newline at end of file |