From d10e9cc661e54a4102a353f3800985eb7333a6db Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 18 Nov 2009 23:48:45 +0100
Subject: simplify fileresource

---
 manifests/vhost/php/standard.pp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'manifests/vhost/php/standard.pp')

diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index d90e1a7..c0344ff 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -60,25 +60,23 @@ define apache::vhost::php::standard(
       },
       default => "${path}/bin"
     }
+    file{$php_safe_mode_exec_bin_dir:
+      recurse => true,
+      purge => true,
+    }
     if $php_safe_mode_exec_bins and ($php_safe_mode_exec_bins != 'absent') {
-      file{$php_safe_mode_exec_bin_dir:
+     File[$php_safe_mode_exec_bin_dir]{
         ensure => directory,
         source => "puppet://$server/modules/common/empty",
-        recurse => true,
-        purge => true,
-        owner => $documentroot_owner,
-        group => $documentroot_group,
-        mode => 0750;
+        owner => $documentroot_owner, group => $documentroot_group, mode => 0750,
       }
-      $php_safe_mode_exec_bins_subst =  regsubst($php_safe_mode_exec_bins,"(.+)","${vhost}_\\1")
+      $php_safe_mode_exec_bins_subst = regsubst($php_safe_mode_exec_bins,"(.+)","${vhost}_\\1")
       apache::vhost::php::safe_mode_bin{ $php_safe_mode_exec_bins_subst:
         path => $php_safe_mode_exec_bin_dir
       }
     }else{
-      file{$php_safe_mode_exec_bin_dir:
+      File[$php_safe_mode_exec_bin_dir]{
         ensure => absent,
-        recurse => true,
-        force => true
       }
     }
 
-- 
cgit v1.2.3