From 30512c2321f5f979bdfe7400593a10d0936da1e0 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 25 Apr 2014 18:00:53 +0200
Subject: use builtin language function instead of an own one

---
 manifests/centos.pp             |  1 -
 manifests/vhost/php/standard.pp | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'manifests')

diff --git a/manifests/centos.pp b/manifests/centos.pp
index 3d9664d..554e7b2 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -40,7 +40,6 @@ class apache::centos inherits apache::package {
         [ '/var/www/vhosts/[^/]*/www(/.*)?',
           '/var/www/vhosts/[^/]*/non_public(/.*)?',
           '/var/www/vhosts/[^/]*/data(/.*)?',
-          '/var/www/vhosts/[^/]*/g2data(/.*)?',
           '/var/www/vhosts/[^/]*/upload(/.*)?' ]:
           require => Package['apache'],
           setype  => $seltype_rw;
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 2d6d8cb..2eb231d 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -127,7 +127,7 @@ define apache::vhost::php::standard(
     $safe_mode_gid = undef
   }
 
-  if has_key($php_settings,'safe_mode_exec_dir') {
+  if ('safe_mode_exec_dir' in $php_settings) {
     $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir]
   } else {
     $php_safe_mode_exec_dir =  $path ? {
@@ -143,7 +143,7 @@ define apache::vhost::php::standard(
     force   => true,
     purge   => true,
   }
-  if has_key($php_options,'safe_mode_exec_bins') {
+  if ('safe_mode_exec_bins' in $php_settings) {
     $std_php_settings_safe_mode_exec_dir = $php_safe_mode_exec_dir
     $ensure_exec = $ensure ? {
       'present'  => directory,
@@ -168,7 +168,7 @@ define apache::vhost::php::standard(
     }
   }
 
-  if !has_key($php_settings,'default_charset') and ($default_charset != 'absent') {
+  if !('default_charset' in $php_settings) and ($default_charset != 'absent') {
     $std_php_settings_default_charset =  $default_charset ? {
       'On'    => 'iso-8859-1',
       default => $default_charset
@@ -177,6 +177,12 @@ define apache::vhost::php::standard(
     $std_php_settings_default_charset = undef
   }
 
+  if ('additional_open_basedir' in $php_options) {
+    $the_open_basedir = "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_options[additional_open_basedir]}"
+  } else {
+    $the_open_basedir = "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}"
+  }
+
   $std_php_settings = {
     engine              => 'On',
     upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
@@ -189,10 +195,7 @@ define apache::vhost::php::standard(
     safe_mode_gid       => $safe_mode_gid,
     safe_mode_exec_dir  => $std_php_settings_safe_mode_exec_dir,
     default_charset     => $std_php_settings_default_charset,
-    open_basedir        => has_key($php_options,'additional_open_basedir') ? {
-      true => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}:${php_options[additional_open_basedir]}",
-      false => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
-    },
+    open_basedir        => $the_open_basedir,
   }
 
   $real_php_settings = merge($std_php_settings,$php_settings)
-- 
cgit v1.2.3