diff options
| -rw-r--r-- | manifests/site.pp | 32 | ||||
| -rw-r--r-- | manifests/site/config.pp | 26 |
2 files changed, 47 insertions, 11 deletions
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 { diff --git a/manifests/site/config.pp b/manifests/site/config.pp index e084b46..60caa86 100644 --- a/manifests/site/config.pp +++ b/manifests/site/config.pp @@ -1,8 +1,26 @@ define apache::site::config( - $ensure = 'present', - $source = false, - $vhost = $name, - $template = 'apache/site.erb', + $ensure = 'present', + $source = false, + $vhost = $name, + $docroot = false, + $redirect = false, + $redirect_match = false, + $protocol = 'http', + $aliases = false, + $server_alias = false, + $use = false, + $template = 'apache/site.erb', + $mpm = true, + $user = '' + $gid = '' + $ssl = false, + $listen = '*', + $https_redirect = false, + $canonical = false, + $canonical_exceptions = '', + $custom_directives = false, + $allow_override = false, + $hosting_domain = hiera('apache::site::domain', $::domain) ) { case $source { true: { |