aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-10 11:56:59 +0100
committerintrigeri <intrigeri@boum.org>2010-11-10 11:56:59 +0100
commit001bbc5ff82337e6ddc7b13fb337b43ed36d2dee (patch)
tree41360e2f8c9f200767168fedcc19e861cb091380 /manifests
parent63a16ad8c07e880e68cb7c0a895f7e26ca1434f8 (diff)
parent63322aa30578c69772d2f1e266a8534b12874a0f (diff)
downloadpuppet-common-001bbc5ff82337e6ddc7b13fb337b43ed36d2dee.tar.gz
puppet-common-001bbc5ff82337e6ddc7b13fb337b43ed36d2dee.tar.bz2
Merge remote branch 'cmaisonneuve/master'
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defines/config_file.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp
index d624c10..2be2460 100644
--- a/manifests/defines/config_file.pp
+++ b/manifests/defines/config_file.pp
@@ -33,7 +33,7 @@ define config_file ($content = '', $source = '', $ensure = 'present') {
file { $name:
ensure => $ensure,
# keep old versions on the server
- backup => server,
+ backup => puppet,
# default permissions for config files
mode => 0644, owner => root, group => 0,
# really detect changes to this file