summaryrefslogtreecommitdiff
path: root/puppet/modules/try
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-05-10 14:48:26 -0400
committerMicah <micah@leap.se>2016-05-10 14:48:26 -0400
commit86c85582065c391aa13c0b9b397dfd1aa2e2ac7b (patch)
tree7c027409a517d862864bf3650f4a8a66f615162d /puppet/modules/try
parent70b1c648b94e6c007b9241a4661f33881e74485f (diff)
parent66b4c6b5ec6fe2f242020845fe92715ae2cdcc1e (diff)
Merge tag '0.8.0'
Release 0.8.0
Diffstat (limited to 'puppet/modules/try')
-rw-r--r--puppet/modules/try/manifests/file.pp26
1 files changed, 13 insertions, 13 deletions
diff --git a/puppet/modules/try/manifests/file.pp b/puppet/modules/try/manifests/file.pp
index cd1bb035..2493d343 100644
--- a/puppet/modules/try/manifests/file.pp
+++ b/puppet/modules/try/manifests/file.pp
@@ -32,17 +32,17 @@ define try::file (
exec {
"chmod_${name}":
command => "/bin/chmod -R ${mode} '${name}'",
- onlyif => "/usr/bin/test $mode",
+ onlyif => "/usr/bin/test ${mode}",
refreshonly => true,
loglevel => debug;
"chown_${name}":
command => "/bin/chown -R ${owner} '${name}'",
- onlyif => "/usr/bin/test $owner",
+ onlyif => "/usr/bin/test ${owner}",
refreshonly => true,
loglevel => debug;
"chgrp_${name}":
command => "/bin/chgrp -R ${group} '${name}'",
- onlyif => "/usr/bin/test $group",
+ onlyif => "/usr/bin/test ${group}",
refreshonly => true,
loglevel => debug;
}
@@ -50,31 +50,31 @@ define try::file (
if $target {
exec { "symlink_${name}":
command => "/bin/ln -s ${target} ${name}",
- onlyif => "/usr/bin/test -d '${target}'",
+ onlyif => "/usr/bin/test -d '${target}'",
}
} elsif $source {
if $ensure == 'directory' {
if $purge {
exec { "rsync_${name}":
command => "/usr/bin/rsync -r --delete '${source}/' '${name}'",
- onlyif => "/usr/bin/test -d '${source}'",
- unless => "/usr/bin/diff -rq '${source}' '${name}'",
- notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
+ onlyif => "/usr/bin/test -d '${source}'",
+ unless => "/usr/bin/diff -rq '${source}' '${name}'",
+ notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
}
} else {
exec { "cp_r_${name}":
command => "/bin/cp -r '${source}' '${name}'",
- onlyif => "/usr/bin/test -d '${source}'",
- unless => "/usr/bin/diff -rq '${source}' '${name}'",
- notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
+ onlyif => "/usr/bin/test -d '${source}'",
+ unless => "/usr/bin/diff -rq '${source}' '${name}'",
+ notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
}
}
} else {
exec { "cp_${name}":
command => "/bin/cp --remove-destination '${source}' '${name}'",
- onlyif => "/usr/bin/test -e '${source}'",
- unless => "/usr/bin/test ! -h '${name}' && /usr/bin/diff -q '${source}' '${name}'",
- notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
+ onlyif => "/usr/bin/test -e '${source}'",
+ unless => "/usr/bin/test ! -h '${name}' && /usr/bin/diff -q '${source}' '${name}'",
+ notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
}
}
}