From 499b3fb152ac52272aa4ba18b52b14fb73449eec Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 18 Jun 2016 13:21:48 -0300 Subject: Adds more params into apache::site::config --- manifests/site.pp | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'manifests/site.pp') diff --git a/manifests/site.pp b/manifests/site.pp index ccde244..ff053b9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -31,7 +31,9 @@ define apache::site( $canonical_exceptions = '', $hidden_service = false, $custom_directives = false, - $allow_override = false + $allow_override = false, + $hosting_domain = hiera('apache::site::domain', $::domain) + ) { $vhost = $filename ? { @@ -39,8 +41,6 @@ define apache::site( default => "$filename", } - $hosting_domain = hiera('apache::site::domain', $::domain) - $user = $mpm_user ? { '' => regsubst($name, '\.', '_', 'G'), default => $mpm_user, @@ -123,10 +123,28 @@ define apache::site( } apache::site::config { $name: - ensure => $ensure, - source => $source, - vhost => $vhost, - template => $template, + ensure => $ensure, + source => $source, + vhost => $vhost, + docroot => $docroot, + redirect => $redirect, + redirect_match => $redirect_match, + protocol => $protocol, + aliases => $aliases, + server_alias => $server_alias, + use => $use, + template => $template, + mpm => $mpm, + user => $user, + gid => $gid, + ssl => $ssl, + listen => $listen, + https_redirect => $https_redirect, + canonical => $canonical, + canonical_exceptions => $canonical_exceptions, + custom_directives => $custom_directives, + allow_override => $allow_override, + hosting_domain => $hosting_domain, } case $ensure { -- cgit v1.2.3