diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/vhost.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/standard.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 6d9ae33..089eb62 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -40,6 +40,7 @@ define apache::vhost( $logpath = 'absent', $logmode = 'default', $template_mode = 'static', + $template_partial = 'absent', $vhost_mode = 'template', $vhost_source = 'absent', $vhost_destination = 'absent', @@ -95,6 +96,7 @@ define apache::vhost( path_is_webdir => $path_is_webdir, logpath => $logpath, logmode => $logmode, + template_partial => $template_partial, domain => $domain, domainalias => $domainalias, server_admin => $server_admin, diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 9437046..61992a1 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -40,6 +40,7 @@ define apache::vhost::php::standard( $manage_webdir = true, $manage_docroot = true, $template_mode = 'php', + $template_partial = 'absent', $owner = root, $group = apache, $documentroot_owner = apache, @@ -152,6 +153,7 @@ define apache::vhost::php::standard( ensure => $ensure, path => $path, template_mode => $template_mode, + template_partial => $template_partial, vhost_mode => $vhost_mode, vhost_source => $vhost_source, vhost_destination => $vhost_destination, diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index b0c08f9..303de0e 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -75,6 +75,7 @@ define apache::vhost::template( $run_uid = 'absent', $run_gid = 'absent', $template_mode = 'static', + $template_partial = 'absent', $ssl_mode = false, $mod_security = true, $mod_security_relevantonly = true, @@ -174,7 +175,10 @@ define apache::vhost::template( } if $ensure != 'absent' { Apache::Vhost::File[$name]{ - content => template("apache/vhosts/$template_mode/$operatingsystem.erb") + content => $template_partial ? { + 'absent' => template("apache/vhosts/$template_mode/$operatingsystem.erb"), + default => template("apache/vhosts/default.erb"), + } } } } |