diff options
| author | mh <mh@immerda.ch> | 2012-06-05 21:35:37 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-05 21:35:37 -0300 |
| commit | 65f6bb2025218692949530db6703792cc6865c02 (patch) | |
| tree | ac44acb252c06d2e7de3e74e0fb56db2dbdd51e5 /manifests/vhost | |
| parent | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (diff) | |
new style for 2.7
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/php/standard.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/php/webapp.pp | 2 | ||||
| -rw-r--r-- | manifests/vhost/proxy.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 3814680..b02e05c 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -135,7 +135,7 @@ define apache::vhost::php::standard( $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir] } else { $php_safe_mode_exec_dir = $path ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { openbsd => "/var/www/htdocs/${name}/bin", default => "/var/www/vhosts/${name}/bin" }, diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index 69951de..3711c1a 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -74,7 +74,7 @@ define apache::vhost::php::webapp( } if $manage_config { - if $config_file == 'absent' { fail("No config file defined for ${name} on ${fqdn}, if you'd like to manage the config, you have to add one!") } + if $config_file == 'absent' { fail("No config file defined for ${name} on ${::fqdn}, if you'd like to manage the config, you have to add one!") } ::apache::vhost::file::documentrootfile{"configurationfile_${name}": documentroot => $documentroot, filename => $config_file, diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp index 113f4ef..1c3b500 100644 --- a/manifests/vhost/proxy.pp +++ b/manifests/vhost/proxy.pp @@ -45,7 +45,7 @@ define apache::vhost::proxy( htpasswd_file => $htpasswd_file, domainalias => $domainalias, server_admin => $server_admin, - logpath => $operatingsystem ? { + logpath => $::operatingsystem ? { openbsd => '/var/www/logs', centos => '/var/log/httpd', default => '/var/log/apache2' |