diff options
author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/vhost/php/standard.pp | |
parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) |
fix various puppet language things
Diffstat (limited to 'manifests/vhost/php/standard.pp')
-rw-r--r-- | manifests/vhost/php/standard.pp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index aea4551..3814680 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -78,9 +78,9 @@ define apache::vhost::php::standard( documentroot_mode => $documentroot_mode, } } - + $real_path = $path ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { openbsd => "/var/www/htdocs/${name}", default => "/var/www/vhosts/${name}" }, @@ -96,13 +96,13 @@ define apache::vhost::php::standard( 'absent' => "$real_path/logs", default => $logpath } - + $std_php_options = { smarty => false, pear => false, } $real_php_options = merge($std_php_options,$php_options) - + if $real_php_options[smarty] { include php::extensions::smarty $smarty_path = '/usr/share/php/Smarty/:' @@ -115,7 +115,7 @@ define apache::vhost::php::standard( } else { $pear_path = '' } - + $std_php_settings = { engine => 'On', @@ -130,7 +130,7 @@ define apache::vhost::php::standard( if $run_mode == 'fcgid' { $std_php_settings[safe_mode_gid] = 'On' } - + if has_key($php_settings,'safe_mode_exec_dir') { $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir] } else { @@ -166,7 +166,7 @@ define apache::vhost::php::standard( ensure => absent, } } - + if !has_key($php_settings,'default_charset') { if $default_charset != 'absent' { $std_php_settings[default_charset] = $default_charset ? { @@ -175,15 +175,12 @@ define apache::vhost::php::standard( } } } - + $real_php_settings = merge($std_php_settings,$php_settings) - + $passing_extension = 'php' if $ensure != 'absent' { case $run_mode { - 'itk': { - include ::php::itk - } 'proxy-itk','static-itk': { include ::php::itk_plus } |