diff options
Diffstat (limited to 'manifests/vhost/webdir.pp')
| -rw-r--r-- | manifests/vhost/webdir.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp index ca3b2b6..e9eda1b 100644 --- a/manifests/vhost/webdir.pp +++ b/manifests/vhost/webdir.pp @@ -13,7 +13,7 @@ define apache::vhost::webdir( $documentroot_recurse = false ){ $real_path = $path ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { openbsd => "/var/www/htdocs/${name}", default => "/var/www/vhosts/${name}" }, @@ -31,7 +31,7 @@ define apache::vhost::webdir( if $owner == 'apache' { if $apache_default_user == '' { - $real_owner = $operatingsystem ? { + $real_owner = $::operatingsystem ? { openbsd => 'www', debian => 'www-data', default => $owner @@ -44,7 +44,7 @@ define apache::vhost::webdir( } if $group == 'apache' { if $apache_default_group == '' { - $real_group = $operatingsystem ? { + $real_group = $::operatingsystem ? { openbsd => 'www', debian => 'www-data', default => $group @@ -58,7 +58,7 @@ define apache::vhost::webdir( if $documentroot_owner == 'apache' { if $apache_default_user == '' { - $real_documentroot_owner = $operatingsystem ? { + $real_documentroot_owner = $::operatingsystem ? { openbsd => 'www', debian => 'www-data', default => $documentroot_owner @@ -71,7 +71,7 @@ define apache::vhost::webdir( } if $documentroot_group == 'apache' { if $apache_default_group == '' { - $real_documentroot_group = $operatingsystem ? { + $real_documentroot_group = $::operatingsystem ? { openbsd => 'www', debian => 'www-data', default => $documentroot_group @@ -85,9 +85,9 @@ define apache::vhost::webdir( case $ensure { absent: { if $manage_docroot { - $managed_directories = [ "$real_path", "${real_path}/private", "$logdir", "$documentroot" ] + $managed_directories = [ $real_path, "${real_path}/private", $logdir, $documentroot ] } else { - $managed_directories = [ "$real_path", "${real_path}/private", "$logdir" ] + $managed_directories = [ $real_path, "${real_path}/private", $logdir ] } file{$managed_directories: ensure => absent, @@ -97,12 +97,12 @@ define apache::vhost::webdir( } } default: { - file{"$real_path": + file{$real_path: ensure => directory, owner => $real_owner, group => $real_group, mode => $real_mode; } if $manage_docroot { - file{"$documentroot": + file{$documentroot: ensure => directory, recurse => $documentroot_recurse, owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode; @@ -112,7 +112,7 @@ define apache::vhost::webdir( ensure => directory, owner => $real_documentroot_owner, group => $real_documentroot_group, mode => 0660; } - case $operatingsystem { + case $::operatingsystem { centos: { include apache::logrotate::centos::vhosts } } file{"${real_path}/private": |