diff options
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/file.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index c31420e..bacdca5 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -14,7 +14,8 @@ define apache::vhost::file( $content = 'absent', $do_includes = false, $htpasswd_file = 'absent', - $htpasswd_path = 'absent' + $htpasswd_path = 'absent', + $use_mod_macro = false ){ $vhosts_dir = $operatingsystem ? { centos => "$apache::centos::config_dir/vhosts.d/", @@ -36,7 +37,10 @@ define apache::vhost::file( owner => root, group => 0, mode => 0644; } if $do_includes { - include apache::includes + include ::apache::includes + } + if $use_mod_macro { + include ::apache::mod_macro } case $content { 'absent': { diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index 84e7f33..b8a5c4c 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -39,6 +39,7 @@ define apache::vhost::template( $template_mode = 'static', $ssl_mode = false, $mod_security = true, + $use_mod_macro = false, $htpasswd_file = 'absent', $htpasswd_path = 'absent', $ldap_auth = false, @@ -109,6 +110,7 @@ define apache::vhost::template( do_includes => $do_includes, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, + use_mod_macro => $use_mod_macro, } } |