summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-11-25 01:20:52 -0800
committerelijah <elijah@riseup.net>2013-11-25 01:20:52 -0800
commite86f20b2435ec251c6373baf4c2ee36d5f26b83e (patch)
tree5dc2a7977bf6e56342c12b58eb0bacc6491ba81d /puppet/modules
parent846728631f5247984dfa69b7e82f5014e10f4427 (diff)
fixed `diff` bug with try::file and directories
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/try/manifests/file.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/try/manifests/file.pp b/puppet/modules/try/manifests/file.pp
index 56a7c997..cd1bb035 100644
--- a/puppet/modules/try/manifests/file.pp
+++ b/puppet/modules/try/manifests/file.pp
@@ -58,14 +58,14 @@ define try::file (
exec { "rsync_${name}":
command => "/usr/bin/rsync -r --delete '${source}/' '${name}'",
onlyif => "/usr/bin/test -d '${source}'",
- unless => "/usr/bin/diff -q '${source}' '${name}'",
+ 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 -q '${source}' '${name}'",
+ unless => "/usr/bin/diff -rq '${source}' '${name}'",
notify => [Exec["chmod_${name}"], Exec["chown_${name}"], Exec["chgrp_${name}"]]
}
}