diff options
Diffstat (limited to 'manifests/vhost/phpdirs.pp')
| -rw-r--r-- | manifests/vhost/phpdirs.pp | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/manifests/vhost/phpdirs.pp b/manifests/vhost/phpdirs.pp index acd423a..ac68f94 100644 --- a/manifests/vhost/phpdirs.pp +++ b/manifests/vhost/phpdirs.pp @@ -1,33 +1,16 @@ define apache::vhost::phpdirs( $ensure = present, - $php_upload_tmp_dir = 'absent', - $php_session_save_path = 'absent', + $php_upload_tmp_dir, + $php_session_save_path, $documentroot_owner = apache, $documentroot_group = 0, $documentroot_mode = 0750, $run_mode = 'normal', $run_uid = 'absent' ){ - # php upload_tmp_dir - case $php_upload_tmp_dir { - 'absent': { - include apache::defaultphpdirs - $real_php_upload_tmp_dir = "/var/www/upload_tmp_dir/$name" - } - default: { $real_php_upload_tmp_dir = $php_upload_tmp_dir } - } - # php session_save_path - case $php_session_save_path { - 'absent': { - include apache::defaultphpdirs - $real_php_session_save_path = "/var/www/session.save_path/$name" - } - default: { $real_php_session_save_path = $php_session_save_path } - } - case $ensure { absent: { - file{[$real_php_upload_tmp_dir, $real_php_session_save_path ]: + file{[$php_upload_tmp_dir, $php_session_save_path ]: ensure => absent, purge => true, force => true, @@ -35,7 +18,7 @@ define apache::vhost::phpdirs( } } default: { - file{[$real_php_upload_tmp_dir, $real_php_session_save_path ]: + file{[$php_upload_tmp_dir, $php_session_save_path ]: ensure => directory, owner => $run_mode ? { 'itk' => $run_uid, |