From 4ffdd03efa75998191f6867a738ee6e5cccb6256 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 24 Feb 2011 22:50:51 +0100 Subject: try a more unique placeholder, because the old one failed with binaries which contained _ in the name --- manifests/vhost/php/safe_mode_bin.pp | 2 +- manifests/vhost/php/standard.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/vhost/php/safe_mode_bin.pp b/manifests/vhost/php/safe_mode_bin.pp index e04557c..5101337 100644 --- a/manifests/vhost/php/safe_mode_bin.pp +++ b/manifests/vhost/php/safe_mode_bin.pp @@ -12,7 +12,7 @@ define apache::vhost::php::safe_mode_bin( $real_path = "$path/$substr" file{$real_path: ensure => $ensure ? { - 'present' => regsubst($name,'^.*_',''), + 'present' => regsubst($name,'^.*_|_',''), default => absent, } } diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index bad7c3d..df9ca6b 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -118,7 +118,7 @@ define apache::vhost::php::standard( source => "puppet:///modules/common/empty", owner => $documentroot_owner, group => $documentroot_group, mode => 0750, } - $php_safe_mode_exec_bins_subst = regsubst($php_safe_mode_exec_bins,"(.+)","${name}_\\1") + $php_safe_mode_exec_bins_subst = regsubst($php_safe_mode_exec_bins,"(.+)","${name}_|_\\1") apache::vhost::php::safe_mode_bin{ $php_safe_mode_exec_bins_subst: ensure => $ensure, path => $real_php_safe_mode_exec_bin_dir -- cgit v1.2.3