address puppet 3.x deprecation warnings

2 files changed, 42 insertions, 80 deletions

diff --git a/manifests/vhost/php/gallery2.pp b/manifests/vhost/php/gallery2.pp
index d2f2e6a..78d5256 100644
--- a/manifests/vhost/php/gallery2.pp
+++ b/manifests/vhost/php/gallery2.pp
@@ -66,7 +66,6 @@ define apache::vhost::php::gallery2(
   $manage_config                    = true,
   $config_webwriteable              = false,
   $manage_directories               = true,
-  $upload_dir                       = 'present'
 ){
   $documentroot = $path ? {
     'absent' => $::operatingsystem ? {
@@ -75,73 +74,27 @@ define apache::vhost::php::gallery2(
     },
     default => "${path}/www"
   }
-  $gdatadir = $path ? {
-    'absent' => $::operatingsystem ? {
-      openbsd => "/var/www/htdocs/${name}/g2data",
-      default => "/var/www/vhosts/${name}/g2data"
-    },
-    default => "${path}/g2data"
-  }
-  if ($upload_dir == 'present') or ($upload_dir == 'absent') {
-    $real_upload_dir = $::operatingsystem ? {
-      openbsd => "/var/www/htdocs/${name}/upload",
-      default => "/var/www/vhosts/${name}/upload"
-    }
-  } else {
-    $real_upload_dir = $upload_dir
-  }
-  $ensure_dir = $ensure ? {
-    'present' => directory,
-    default   => absent
-  }
-  file{
-    $gdatadir:
-      ensure  => $ensure_dir,
-      owner   => $documentroot_owner,
-      group   => $documentroot_group,
-      mode    => '0660';
-    $real_upload_dir:
-      owner   => $documentroot_owner,
-      group   => $documentroot_group,
-      mode    => '0660';
-  }
-  if ($ensure == 'absent') or ($upload_dir == 'absent') {
-    File[$real_upload_dir]{
-      ensure => absent,
-      purge => true,
-      force => true,
-      recurse => true
-    }
-  } else {
-    File[$real_upload_dir]{
-      ensure => directory
+  $upload_dir = "/var/www/vhosts/${name}/data/upload"
+  $gdata_dir = "/var/www/vhosts/${name}/data/gdata"
+  if $ensure != 'absent' {
+    file{
+      $gdata_dir:
+        ensure  => 'directory',
+        owner   => $documentroot_owner,
+        group   => $documentroot_group,
+        mode    => '0660';
+      $upload_dir:
+        ensure  => 'directory',
+        owner   => $documentroot_owner,
+        group   => $documentroot_group,
+        mode    => '0660';
     }
   }
 
   $gallery_php_settings = {
-    safe_mode => 'Off',
+    safe_mode        => 'Off',
     output_buffering => 'Off',
   }
-
-  # php upload_tmp_dir
-  case $php_settings[upload_tmp_dir] {
-    '',undef: {
-      $php_settings[upload_tmp_dir] = "/var/www/upload_tmp_dir/${name}"
-    }
-  }
-  # php session_save_path
-  case $php_settings['session.save_path'] {
-    '',undef: {
-      $php_settings['session.save_path'] = "/var/www/session.save_path/${name}"
-    }
-  }
-
-  if $upload_dir != 'absent' {
-    $gallery_php_settings[open_basedir] = "${documentroot}:${php_settings[upload_tmp_dir]}:${php_settings['session.save_path']}:${gdatadir}:${real_upload_dir}"
-  } else {
-    $gallery_php_settings[open_basedir] = "${documentroot}:${php_settings[upload_tmp_dir]}:${php_settings['session.save_path']}:${gdatadir}"
-  }
-
   $real_php_settings = merge($gallery_php_settings,$php_settings)
 
   # create vhost configuration file
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 160f638..c34e339 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -116,19 +116,15 @@ define apache::vhost::php::standard(
     $pear_path = ''
   }
 
-
-  $std_php_settings = {
-    engine              =>  'On',
-    upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
-    'session.save_path' => "/var/www/session.save_path/${name}",
-    open_basedir        => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
-    safe_mode           => 'On'
-  }
   if $logmode != 'nologs' {
-    $std_php_settings[error_log] = "${logdir}/php_error_log"
+    $php_error_log = "${logdir}/php_error_log"
+  } else {
+    $php_error_log = undef
   }
   if $run_mode == 'fcgid' {
-    $std_php_settings[safe_mode_gid] = 'On'
+    $safe_mode_gid = 'On'
+  } else {
+    $safe_mode_gid = undef
   }
 
   if has_key($php_settings,'safe_mode_exec_dir') {
@@ -148,7 +144,7 @@ define apache::vhost::php::standard(
     purge   => true,
   }
   if has_key($php_options,'safe_mode_exec_bins') {
-    $std_php_settings[safe_mode_exec_dir] = $php_safe_mode_exec_dir
+    $std_php_settings_safe_mode_exec_dir = $php_safe_mode_exec_dir
     $ensure_exec = $ensure ? {
       'present'  => directory,
       default    => 'absent',
@@ -165,19 +161,32 @@ define apache::vhost::php::standard(
         ensure  => $ensure,
         path    => $php_safe_mode_exec_dir;
     }
-  }else{
+  } else {
+    $std_php_settings_safe_mode_exec_dir = undef
     File[$php_safe_mode_exec_dir]{
       ensure => absent,
     }
   }
 
-  if !has_key($php_settings,'default_charset') {
-    if $default_charset != 'absent' {
-      $std_php_settings[default_charset] =  $default_charset ? {
-        'On'    => 'iso-8859-1',
-        default => $default_charset
-      }
+  if !has_key($php_settings,'default_charset') and ($default_charset != 'absent') {
+    $std_php_settings_default_charset =  $default_charset ? {
+      'On'    => 'iso-8859-1',
+      default => $default_charset
     }
+  } else {
+    $std_php_settings_default_charset = undef
+  }
+
+  $std_php_settings = {
+    engine              => 'On',
+    upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
+    'session.save_path' => "/var/www/session.save_path/${name}",
+    open_basedir        => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
+    safe_mode           => 'On',
+    error_log           => $php_error_log,
+    safe_mode_gid       => $safe_mode_gid,
+    safe_mode_exec_dir  => $std_php_settings_safe_mode_exec_dir,
+    default_charset     => $std_php_settings_default_charset,
   }
 
   $real_php_settings = merge($std_php_settings,$php_settings)