diff options
| author | mh <mh@immerda.ch> | 2011-02-24 22:51:56 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-02-24 22:51:56 +0100 |
| commit | 616fcb124ebe423929b70ca153a858a238a16846 (patch) | |
| tree | a34903345f56cf57b1cd57306f57e771edb87f43 /manifests/vhost | |
| parent | 4ffdd03efa75998191f6867a738ee6e5cccb6256 (diff) | |
use a better subsitution
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/php/safe_mode_bin.pp | 2 | ||||
| -rw-r--r-- | 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 5101337..ee7a566 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 df9ca6b..9f988d1 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 |