From 8d3f102e47ee6763e011adaf1c9d4ab771a4429c Mon Sep 17 00:00:00 2001 From: Roy Hubbard Date: Sun, 8 Jan 2017 00:11:22 -0500 Subject: [PATCH 1/2] Fix paths for phpunit on FreeBSD --- manifests/phpunit.pp | 2 +- manifests/phpunit/auto_update.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/phpunit.pp b/manifests/phpunit.pp index 2defb807..643800da 100644 --- a/manifests/phpunit.pp +++ b/manifests/phpunit.pp @@ -28,7 +28,7 @@ exec { 'download phpunit': command => "wget ${source} -O ${path}", creates => $path, - path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/'], + path => ['/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin'], require => [Class['php::cli'],Package['wget']], } -> file { $path: diff --git a/manifests/phpunit/auto_update.pp b/manifests/phpunit/auto_update.pp index 3e7e4750..2510553c 100644 --- a/manifests/phpunit/auto_update.pp +++ b/manifests/phpunit/auto_update.pp @@ -22,7 +22,7 @@ exec { 'update phpunit': command => "wget ${source} -O ${path}", onlyif => "test `find '${path}' -mtime +${max_age}`", - path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ], + path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin', '/usr/local/sbin' ], require => File[$path], } } From d94c0fabf180bc659ce7cc658ea3d09d5f1a48eb Mon Sep 17 00:00:00 2001 From: Roy Hubbard Date: Sun, 8 Jan 2017 00:35:27 -0500 Subject: [PATCH 2/2] Use system-dependent value for group --- manifests/phpunit.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/phpunit.pp b/manifests/phpunit.pp index 643800da..3ff30886 100644 --- a/manifests/phpunit.pp +++ b/manifests/phpunit.pp @@ -17,6 +17,7 @@ class php::phpunit ( String $source = $php::params::phpunit_source, Stdlib::Absolutepath $path = $php::params::phpunit_path, + String[1] $root_group = $php::params::root_group, Boolean $auto_update = true, Integer $max_age = $php::params::phpunit_max_age, ) inherits php::params { @@ -34,7 +35,7 @@ -> file { $path: mode => '0555', owner => root, - group => root, + group => $root_group, } if $auto_update {